]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 11 Oct 2011 04:08:24 +0000 (15:08 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 11 Oct 2011 04:08:24 +0000 (15:08 +1100)
commit0c395c77af844fe2bdc9f3821f6d7fb2b8714db8
tree1cccf9c7364dbaba1aed2d6cd17bd07c9f5cb5e3
parent9f93bbcacb4f5c56870e8980d25cfbc4bd802505
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