David Woodhouse e758936e02 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: include/asm-x86/statfs.h		2008-10-13 17:13:56 +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	Merge branches 'sched/devel', 'sched/cpu-hotplug', 'sched/cpusets' and 'sched/urgent' into sched/core	2008-10-08 11:31:02 +02:00
lib	m32r: export __ndelay	2008-09-27 18:27:21 +09:00
mm	m32r: use generic show_mem()	2008-07-26 12:00:11 -07:00
oprofile	Combine instrumentation menus in kernel/Kconfig.instrumentation	2007-10-19 11:53:54 -07:00
platforms	m32r: Move dot.gdbinit files	2007-09-03 11:30:18 +09:00
Kconfig	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-10-13 17:13:56 +01:00
Kconfig.debug
Makefile	m32r: use KBUILD_DEFCONFIG	2008-04-29 14:46:00 +09:00