linux_dsm_epyc7002/arch/sparc64
David S. Miller 6ab33d5171 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/ixgbe/ixgbe_main.c
	include/net/mac80211.h
	net/phonet/af_phonet.c
2008-11-20 16:44:00 -08: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/net-2.6 2008-11-20 16:44:00 -08:00
lib Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 2008-10-31 07:52:51 -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 oprofile: more whitespace fixes 2008-10-15 20:55:51 +02:00
prom sparc64: remove CVS keywords 2008-05-20 00:33:43 -07:00
defconfig sparc64: Update defconfig. 2008-11-10 12:35:29 -08:00
Kconfig ftrace: disable dynamic ftrace for all archs that use daemon 2008-10-23 16:00:21 +02:00
Kconfig.debug ftrace: rename FTRACE to FUNCTION_TRACER 2008-10-20 18:27:03 +02:00
Makefile sparc64: Add __arch64__ to CHECKFLAGS 2008-09-11 23:14:52 -07:00