Ingo Molnar 82268da1b1 Merge branch 'linus' into percpu-cpumask-x86-for-linus-2 ... Conflicts: arch/sparc/kernel/time_64.c drivers/gpu/drm/drm_proc.c Manual merge to resolve build warning due to phys_addr_t type change on x86: drivers/gpu/drm/drm_info.c Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-03-28 04:26:01 +01:00
..
boot	sparc,sparc64: unify boot/	2008-12-04 09:17:21 -08:00
configs	eeprom: More consistent symbol names	2009-01-26 21:19:57 +01:00
include/asm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6	2009-03-26 15:56:53 -07:00
kernel	Merge branch 'linus' into percpu-cpumask-x86-for-linus-2	2009-03-28 04:26:01 +01:00
lib	sparc64: Fix probe_kernel_{read,write}().	2009-02-08 22:32:31 -08:00
math-emu	sparc64: unify math-emu	2008-12-04 09:16:56 -08:00
mm	sparc64: Reschedule KGDB capture to a software interrupt.	2009-03-18 23:51:57 -07:00
oprofile	sparc64: Implement NMI watchdog on capable cpus.	2009-01-30 00:03:53 -08:00
prom	sparc: Eliminate PROMLIB_INTERNAL as it does nothing	2009-01-08 16:59:01 -08:00
Kconfig	[CVE-2009-0029] sparc: Enable syscall wrappers for 64-bit	2009-01-19 20:21:49 -08:00
Kconfig.debug	sparc: unify Kconfig.debug	2008-12-04 09:16:48 -08:00
Makefile	sparc: unify kernel/init_task	2008-12-04 13:28:09 -08:00