]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>
Fri, 3 May 2013 21:41:04 +0000 (18:41 -0300)
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>
Fri, 3 May 2013 21:41:04 +0000 (18:41 -0300)
1  2 
net/bluetooth/mgmt.c
net/bluetooth/smp.c

Simple merge
Simple merge