Ingo Molnar 8163d88c79 Merge commit 'v2.6.29-rc7' into perfcounters/core ...

Conflicts:
	arch/x86/mm/iomap_32.c

2009-03-04 11:42:31 +01:00

..

calibrate.c

x86: remove stray <6> in BogoMIPS printk

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

do_mounts_initrd.c

…

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 commit 'v2.6.29-rc4' into perfcounters/core

2009-02-11 09:22:04 +01:00

main.c

Merge commit 'v2.6.29-rc7' into perfcounters/core

2009-03-04 11:42:31 +01:00

Makefile

…

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