]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 14 Nov 2011 00:59:22 +0000 (11:59 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 14 Nov 2011 00:59:22 +0000 (11:59 +1100)
1  2 
include/net/bluetooth/hci_core.h
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c

Simple merge
Simple merge
Simple merge