David S. Miller 2e57572a50 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 ... Conflicts: arch/sparc64/kernel/pci_psycho.c		2008-09-16 14:11:43 -07:00
..
boot	sparc64: remove CVS keywords	2008-05-20 00:33:43 -07:00
kernel	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6	2008-09-16 14:11:43 -07:00
lib	sparc64: Implement IRQ stacks.	2008-08-12 18:33:56 -07:00
math-emu	sparc64: remove CVS keywords	2008-05-20 00:33:43 -07:00
mm	sparc64: Kill sparse warnings in mm/init.h	2008-09-12 00:19:21 -07:00
oprofile	Combine instrumentation menus in kernel/Kconfig.instrumentation	2007-10-19 11:53:54 -07:00
prom	sparc64: remove CVS keywords	2008-05-20 00:33:43 -07:00
defconfig	sparc64: Update defconfig.	2008-07-18 01:49:06 -07:00
Kconfig	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6	2008-09-08 15:39:30 -07:00
Kconfig.debug	sparc64: add ftrace support.	2008-05-23 22:36:13 +02:00
Makefile	sparc64: Add __arch64__ to CHECKFLAGS	2008-09-11 23:14:52 -07:00