Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 9 Nov 2009 07:00:54 +0000 (23:00 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 Nov 2009 07:00:54 +0000 (23:00 -0800)
commitd0e1e88d6e7dbd8e1661cb6a058ca30f54ee39e4
treedaab7cc0db83226672f76d2fc9277e4355f89e6b
parent9e0d57fd6dad37d72a3ca6db00ca8c76f2215454
parent2606289779cb297320a185db5997729d29b6700b
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/can/usb/ems_usb.c
12 files changed:
drivers/net/benet/be.h
drivers/net/benet/be_ethtool.c
drivers/net/benet/be_main.c
drivers/net/can/dev.c
drivers/net/can/usb/ems_usb.c
drivers/net/fsl_pq_mdio.c
drivers/net/ixgbe/ixgbe_main.c
drivers/net/qlge/qlge_main.c
drivers/net/qlge/qlge_mpi.c
drivers/net/wireless/ipw2x00/ipw2200.c
net/can/bcm.c
net/ipv4/ipip.c