Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 21 Jul 2011 20:38:42 +0000 (13:38 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 21 Jul 2011 20:38:42 +0000 (13:38 -0700)
commit033b1142f4bd44a116d1356fe4a0510437ceddf9
treed2a971a7dc9f3a1af8035e38419c4c4ad8c22632
parentf5caadbb3d8fc0b71533e880c684b2230bdb76ac
parente6625fa48e6580a74b7e700efd7e6463e282810b
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
net/bluetooth/l2cap_core.c
drivers/net/bonding/bond_main.c
drivers/net/gianfar.c
drivers/net/gianfar.h
drivers/net/r6040.c
include/linux/netdevice.h
net/8021q/vlan_dev.c
net/bluetooth/l2cap_core.c