]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 01:28:00 +0000 (11:28 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 01:28:00 +0000 (11:28 +1000)
commit784953eb25d34d141da822393fbaa135ca13f37b
treeb6e35796debccf3fa8df33e78c636002ead70a30
parent09be3fe7d7205c4bb75c140ae98a0d527b6a1e18
parent8920047889584998d9e13bcbbc6300bb4f5a8484
Merge remote-tracking branch 'bluetooth/master'

Conflicts:
net/bluetooth/hci_core.c
net/bluetooth/l2cap_core.c
net/bluetooth/mgmt.c
net/bluetooth/smp.c
drivers/bluetooth/btusb.c
include/net/bluetooth/l2cap.h
net/bluetooth/hci_conn.c
net/bluetooth/hidp/core.c
net/bluetooth/l2cap_core.c