aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
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 /kernel
parentMerge tag 'fbdev-fixes-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux (diff)
parentARM: 8564/1: fix cpu feature extracting helper (diff)
downloadlinux-dev-f862d66a1a4609e61cd87c7ff4c7d9a234103d67.tar.xz
linux-dev-f862d66a1a4609e61cd87c7ff4c7d9a234103d67.zip
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 'kernel')
0 files changed, 0 insertions, 0 deletions