]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 01:20:53 +0000 (12:20 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 01:20:55 +0000 (12:20 +1100)
commit69941a994a849504d6c81a3e4244edd3cd8cab97
treea4afbf50d5c9fbe268978d3fc2d22c239061c532
parentf558a51fe1769ba4450e0d5dd5479370352e5030
parente825eb1d7e06f616003c17e2e8e421c2e5e44142
Merge remote-tracking branch 'bluetooth/master'

Conflicts:
net/ieee802154/6lowpan.c
drivers/bluetooth/btusb.c
net/ieee802154/6lowpan_iphc.c
net/ipv6/addrconf.c