You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		16 years ago
..
boot	sparc,sparc64: unify boot/	16 years ago
configs	eeprom: More consistent symbol names	16 years ago
include/asm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6	16 years ago
kernel	Merge branch 'linus' into percpu-cpumask-x86-for-linus-2	16 years ago
lib	sparc64: Fix probe_kernel_{read,write}().	16 years ago
math-emu	sparc64: unify math-emu	16 years ago
mm	sparc64: Reschedule KGDB capture to a software interrupt.	16 years ago
oprofile	sparc64: Implement NMI watchdog on capable cpus.	16 years ago
prom	sparc: Eliminate PROMLIB_INTERNAL as it does nothing	16 years ago
Kconfig	[CVE-2009-0029] sparc: Enable syscall wrappers for 64-bit	16 years ago
Kconfig.debug	sparc: unify Kconfig.debug	16 years ago
Makefile	sparc: unify kernel/init_task	16 years ago