Ingo Molnar b2b062b816 Merge branch 'core/percpu' into stackprotector ...

Conflicts:
	arch/x86/include/asm/pda.h
	arch/x86/include/asm/system.h

Also, moved include/asm-x86/stackprotector.h to arch/x86/include/asm.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2009-01-18 18:37:14 +01:00

..

calibrate.c

x86: remove stray <6> in BogoMIPS printk

2008-07-28 14:22:26 +02:00

do_mounts_initrd.c

Freezer: Fix s2disk resume from initrd

2007-11-20 22:22:42 -05:00

do_mounts_md.c

autodetect_raid: add missing __init marking

2009-01-06 15:59:12 -08:00

do_mounts_rd.c

Squashfs: initrd support

2009-01-05 08:46:28 +00:00

do_mounts.c

async: Asynchronous function calls to speed up kernel boot

2009-01-07 08:45:46 -08:00

do_mounts.h

make init/do_mounts.c:root_device_name static

2008-07-26 12:00:12 -07:00

initramfs.c

NOMMU: Support XIP on initramfs

2009-01-08 12:04:48 +00:00

Kconfig

memcg: mem+swap controller Kconfig

2009-01-08 08:31:05 -08:00

main.c

Merge branch 'core/percpu' into stackprotector

2009-01-18 18:37:14 +01:00

Makefile

kbuild: fix make V=1

2008-02-11 17:43:54 +01:00

noinitramfs.c

…

version.c

init/version.c: define version_string only if CONFIG_KALLSYMS is not defined

2008-07-25 10:53:29 -07:00