summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-03-11 01:26:36 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2014-03-11 01:26:36 +0100
commit8712a00514e50aafa7c9bf5cd3955fa60758e53b (patch)
treef5a571fb60ee2fe1320001aed744eaa5e8c832e0 /arch/x86
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff)
parentcris: convert ffs from an object-like macro to a function-like macro (diff)
downloadlinux-8712a00514e50aafa7c9bf5cd3955fa60758e53b.tar.xz
linux-8712a00514e50aafa7c9bf5cd3955fa60758e53b.zip
Merge branch 'akpm' (patches from Andrew Morton)
Merge misc fixes from Andrew Morton: "Nine fixes" * emailed patches from Andrew Morton akpm@linux-foundation.org>: cris: convert ffs from an object-like macro to a function-like macro hfsplus: add HFSX subfolder count support tools/testing/selftests/ipc/msgque.c: handle msgget failure return correctly MAINTAINERS: blackfin: add git repository revert "kallsyms: fix absolute addresses for kASLR" mm/Kconfig: fix URL for zsmalloc benchmark fs/proc/base.c: fix GPF in /proc/$PID/map_files mm/compaction: break out of loop on !PageBuddy in isolate_freepages_block mm: fix GFP_THISNODE callers and clarify
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions