]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'net-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 03:04:26 +0000 (13:04 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 03:04:26 +0000 (13:04 +1000)
commit572ceccee8d6a55d59ffd339f7e4acb64f04012e
tree952086743976c7afdd80723118bc188520238e1b
parent3b89c507af0270eabbb315fba885d2e95003896b
parent56892261ed1a854db5363df8bb3fbdb2c6c28d4c
Merge remote-tracking branch 'net-next/master'
24 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
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/sctp/socket.c