Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/Makefile
Simple merge

diff --cc drivers/net/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/ehea/ehea.h
Simple merge

diff --cc drivers/net/ehea/ehea_main.c
Simple merge

diff --cc drivers/net/ll_temac_main.c
Simple merge

diff --cc drivers/net/qlcnic/qlcnic_main.c
Simple merge

diff --cc drivers/net/wireless/ipw2x00/ipw2100.c
Simple merge

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