]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 16 Oct 2012 01:00:31 +0000 (12:00 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 16 Oct 2012 01:00:36 +0000 (12:00 +1100)
commit8f7f1c11e0f95ad511f8f957b22fe892c566437a
treec66f81d1f497f51c06d33c666a663ae9f9b7905d
parent827dde58445fb7cc7dd5e4fe7f63f68e4a46f265
parent4b84058f3c1277735fc6c5b3396c2f648e2dd024
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
include/linux/mempolicy.h
mm/huge_memory.c
mm/mempolicy.c
25 files changed:
MAINTAINERS
arch/x86/Kconfig
arch/x86/include/asm/pgtable.h
arch/x86/kernel/setup.c
include/asm-generic/pgtable.h
include/linux/acpi.h
include/linux/huge_mm.h
include/linux/init_task.h
include/linux/mempolicy.h
include/linux/mm.h
include/linux/mm_types.h
include/linux/mmzone.h
include/linux/sched.h
include/uapi/linux/mempolicy.h
init/Kconfig
kernel/sched/core.c
kernel/sysctl.c
lib/Makefile
mm/huge_memory.c
mm/memory.c
mm/mempolicy.c
mm/pgtable-generic.c
mm/vmstat.c
scripts/kconfig/Makefile
tools/perf/Makefile