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.

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		16 years ago
..
boot	sparc64: remove CVS keywords	17 years ago
kernel	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	16 years ago
lib	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6	17 years ago
math-emu	sparc64: remove CVS keywords	17 years ago
mm	sparc64: Kill sparse warnings in mm/init.h	17 years ago
oprofile	oprofile: more whitespace fixes	17 years ago
prom	sparc64: remove CVS keywords	17 years ago
Kconfig	ftrace: disable dynamic ftrace for all archs that use daemon	17 years ago
Kconfig.debug	ftrace: rename FTRACE to FUNCTION_TRACER	17 years ago
Makefile	sparc64: Add __arch64__ to CHECKFLAGS	17 years ago
defconfig	sparc64: Update defconfig.	16 years ago