summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-04-21 08:45:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-04-21 08:45:02 -0700
commitf862d66a1a4609e61cd87c7ff4c7d9a234103d67 (patch)
tree891252ef4a80befff1ea83a00eb42f1bad986ccf /net
parent90e6a6894b1f197e134f4771dd6df06e45862c39 (diff)
parentac36a881b72a1e9831f1c59abf935868c90685cf (diff)
downloadlinux-f862d66a1a4609e61cd87c7ff4c7d9a234103d67.tar.bz2
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King: "Three further fixes for ARM. Alexandre Courbot was having problems with DMA allocations with the GFP flags affecting where the tracking data was being allocated from. Vladimir Murzin noticed that the CPU feature code was not entirely correct, which can cause some features to be misreported" * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: ARM: 8564/1: fix cpu feature extracting helper ARM: 8563/1: fix demoting HWCAP_SWP ARM: 8551/2: DMA: Fix kzalloc flags in __dma_alloc
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions