Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 21 Oct 2010 15:43:05 +0000 (08:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 21 Oct 2010 15:43:05 +0000 (08:43 -0700)
commit2198a10b501fd4443430cb17e065a9e859cc58c9
tree87f3781d293da0f8f8f61615905eb7bf62b7c128
parent9941fb62762253774cc6177d0b9172ece5133fe1
parentdb5a753bf198ef7a50e17d2ff358adf37efe8648
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
net/core/dev.c
13 files changed:
MAINTAINERS
drivers/net/b44.c
drivers/net/ehea/ehea_main.c
drivers/net/gianfar_ethtool.c
drivers/net/r6040.c
drivers/net/tg3.c
drivers/net/tg3.h
drivers/vhost/vhost.c
include/linux/Kbuild
net/bluetooth/l2cap.c
net/core/dev.c
net/rds/page.c
net/tipc/subscr.c