Ingo Molnar fc6fc7f1b1 Merge branch 'linus' into x86/apic ...

Conflicts:
	arch/x86/mach-default/setup.c

Semantic conflict resolution:
	arch/x86/kernel/setup.c

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

2009-02-22 20:05:19 +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

Consolidate driver_probe_done() loops into one place

2009-02-21 14:17:17 -08:00

do_mounts_rd.c

Squashfs: initrd support

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

do_mounts.c

Consolidate driver_probe_done() loops into one place

2009-02-21 14:17:17 -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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

2009-01-26 15:10:37 -08:00

main.c

smp, generic: introduce arch_disable_smp_support() instead of disable_ioapic_setup()

2009-02-05 22:27:54 +01:00

Makefile

kbuild: fix make V=1

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

noinitramfs.c

[PATCH] disable init/initramfs.c

2007-02-11 10:51:25 -08:00

version.c

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

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