kernel_optimize_test/arch
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
..
alpha
arm
avr32
blackfin
cris
frv
h8300
ia64 [IA64] xen: fix xen_get_eflags. 2008-11-20 13:43:01 -08:00
m32r
m68k
m68knommu
mips MIPS: csrc-r4k: Fix declaration depending on the wrong CONFIG_ symbol. 2008-11-20 19:42:33 +00:00
mn10300
parisc parisc: fix bug in compat_arch_ptrace 2008-11-20 13:09:17 -08:00
powerpc
s390 netdev: introduce dev_get_stats() 2008-11-19 21:40:23 -08:00
sh
sparc
sparc64 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-11-20 16:44:00 -08:00
um
x86 x86: Fix interrupt leak due to migration 2008-11-20 13:17:40 -08:00
xtensa
.gitignore
Kconfig