Rusty Russell 968ea6d80e Merge ../linux-2.6-x86 ... Conflicts: arch/x86/kernel/io_apic.c kernel/sched.c kernel/sched_stats.h		2008-12-13 21:55:51 +10:30
..
boot	inflate: refactor inflate malloc code	2008-07-25 10:53:28 -07:00
configs
kernel	cpumask: centralize cpu_online_map and cpu_possible_map	2008-12-13 21:19:41 +10:30
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
Kconfig	Merge ../linux-2.6-x86	2008-12-13 21:55:51 +10:30
Kconfig.debug
Makefile	m32r: use KBUILD_DEFCONFIG	2008-04-29 14:46:00 +09:00