linux-stable

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 22:50:41 +00:00

History

Ingo Molnar f541ae326f Merge branch 'linus' into perfcounters/core-v2

Merge reason: we have gathered quite a few conflicts, need to merge upstream

Conflicts:
	arch/powerpc/kernel/Makefile
	arch/x86/ia32/ia32entry.S
	arch/x86/include/asm/hardirq.h
	arch/x86/include/asm/unistd_32.h
	arch/x86/include/asm/unistd_64.h
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/irq.c
	arch/x86/kernel/syscall_table_32.S
	arch/x86/mm/iomap_32.c
	include/linux/sched.h
	kernel/Makefile

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

2009-04-06 09:02:57 +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