Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Sun, 22 Aug 2010 06:32:24 +0000 (23:32 -0700)]
1  2 
drivers/net/Kconfig
drivers/net/Makefile
drivers/net/bnx2x/bnx2x_main.c
drivers/net/ehea/ehea.h
drivers/net/ehea/ehea_main.c
drivers/net/ll_temac_main.c
drivers/net/qlcnic/qlcnic_main.c
drivers/net/wireless/ipw2x00/ipw2100.c
net/core/dev.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge