]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'net-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 22 Aug 2012 02:10:17 +0000 (12:10 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 22 Aug 2012 02:10:17 +0000 (12:10 +1000)
commitf35135b70acfcc2c4d427cd616853c686e06e98e
treef3fce0a46faa67d7cc924c54b4d3aa6ac1688644
parent928f8405318b51e4670d7287f797cebd3eda3c10
parent1d76efe1577b4323609b1bcbfafa8b731eda071a
Merge remote-tracking branch 'net-next/master'
26 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/sctp/socket.c
net/xfrm/xfrm_policy.c