Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit8244132ea89cdd128003f5b9980fab50d8d36d72
authorDavid S. Miller <davem@davemloft.net>
Thu, 24 Jun 2010 01:26:27 +0000 (23 18:26 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 24 Jun 2010 01:26:27 +0000 (23 18:26 -0700)
treec6cf9327cf9b6bab5bb830bbf389a514f4d7bb95
parent7b2ff18ee7b0ec4bc3162f821e221781aaca48bd
parent38000a94a902e94ca8b5498f7871c6316de8957a
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
net/ipv4/ip_output.c
drivers/net/Kconfig
drivers/net/bnx2.c
drivers/net/cnic.c
drivers/net/gianfar.c
drivers/net/ucc_geth.c
drivers/net/usb/hso.c
drivers/net/wireless/ath/ath5k/attach.c
net/bridge/br_fdb.c
net/bridge/br_forward.c
net/ipv4/ip_output.c