Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David S. Miller [Wed, 22 Aug 2012 21:21:38 +0000 (14:21 -0700)]
25 files changed:
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge