Merge remote branch 'linus/master' into x86/bootmem
authorH. Peter Anvin <hpa@zytor.com>
Thu, 11 Feb 2010 00:55:28 +0000 (16:55 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 11 Feb 2010 00:55:28 +0000 (16:55 -0800)
commit84abd88a70090cf00f9e45c3a81680874f17626e
tree4f58b80057f6e1f5817af1dc33a5458b3dfc9a99
parent13ca0fcaa33f6b1984c4111b6ec5df42689fea6f
parente28cab42f384745c8a947a9ccd51e4aae52f5d51
Merge remote branch 'linus/master' into x86/bootmem
arch/mips/mm/init.c
arch/score/mm/init.c
arch/x86/kernel/e820.c
arch/x86/kernel/setup.c
arch/x86/mm/ioremap.c
include/linux/mm.h
kernel/resource.c