Ingo Molnar 5ea472a77f Merge commit 'v2.6.30-rc1' into perfcounters/core ...

Conflicts:
	arch/powerpc/include/asm/systbl.h
	arch/powerpc/include/asm/unistd.h
	include/linux/init_task.h

Merge reason: the conflicts are non-trivial: PowerPC placement
              of sys_perf_counter_open has to be mixed with the
	      new preadv/pwrite syscalls.

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

2009-04-08 10:35:30 +02: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

md: move lots of #include lines out of .h files and into .c

2009-03-31 14:33:13 +11:00

do_mounts_rd.c

init: make initrd/initramfs decompression failure a KERN_EMERG event

2009-01-14 11:28:35 -08:00

do_mounts.c

Get rid of indirect include of fs_struct.h

2009-03-31 23:00:27 -04:00

do_mounts.h

md: move lots of #include lines out of .h files and into .c

2009-03-31 14:33:13 +11:00

initramfs.c

initramfs: prevent initramfs printk message being split by messages from other code.

2009-04-02 19:04:51 -07:00

Kconfig

Merge commit 'v2.6.30-rc1' into perfcounters/core

2009-04-08 10:35:30 +02:00

main.c

Merge branch 'tracing/core-v2' into tracing-for-linus

2009-04-02 00:49:02 +02: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