Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 22 Aug 2012 21:21:38 +0000 (14:21 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 22 Aug 2012 21:21:38 +0000 (14:21 -0700)
commit1304a7343b30fc4f16045412efdbb4179a3d9255
tree83d667ac4f62e30f70305ce4cc7e030e3465f92e
parent1d76efe1577b4323609b1bcbfafa8b731eda071a
parent23dcfa61bac244e1200ff9ad19c6e9144dcb6bb5
Merge git://git./linux/kernel/git/davem/net
25 files changed:
drivers/bluetooth/btusb.c
drivers/net/bonding/bond_main.c
drivers/net/team/team.c
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath5k/mac80211-ops.c
include/linux/Kbuild
include/linux/if_team.h
include/linux/jiffies.h
include/linux/netdevice.h
include/net/dst.h
include/net/xfrm.h
net/bluetooth/hci_event.c
net/bluetooth/hci_sock.c
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c
net/bluetooth/rfcomm/sock.c
net/bluetooth/sco.c
net/core/dev.c
net/ipv4/fib_trie.c
net/ipv4/route.c
net/ipv4/tcp_input.c
net/ipv4/tcp_ipv4.c
net/ipv6/tcp_ipv6.c
net/packet/af_packet.c
net/xfrm/xfrm_policy.c