Ingo Molnar a64d31baed Merge branch 'linus' into cpus4096 ... Conflicts: kernel/trace/ring_buffer.c		2008-12-02 20:09:50 +01:00
..
boot	inflate: refactor inflate malloc code	2008-07-25 10:53:28 -07:00
configs	m32r: Add defconfig file for the usrv platform.	2007-09-03 11:30:18 +09:00
kernel	m32r: section noise in head.S	2008-11-30 10:03:37 -08:00
lib	m32r: export __ndelay	2008-09-27 18:27:21 +09:00
mm	generic: make PFN_PHYS explicitly return phys_addr_t	2008-09-14 17:24:26 +02:00
oprofile	oprofile: more whitespace fixes	2008-10-15 20:55:51 +02:00
platforms	m32r: Move dot.gdbinit files	2007-09-03 11:30:18 +09:00
Kconfig	sched: rename SCHED_NO_NO_OMIT_FRAME_POINTER => SCHED_OMIT_FRAME_POINTER	2008-11-11 08:59:20 +01:00
Kconfig.debug	[PATCH] kconfig: clarify memory debug options	2006-03-25 08:22:54 -08:00
Makefile	m32r: use KBUILD_DEFCONFIG	2008-04-29 14:46:00 +09:00