Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>
Tue, 26 Jun 2012 15:36:30 +0000 (08:36 -0700)
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>
Tue, 26 Jun 2012 15:36:30 +0000 (08:36 -0700)
1  2 
drivers/bluetooth/btmrvl_sdio.c
drivers/bluetooth/btusb.c
net/bluetooth/l2cap_core.c
net/bluetooth/mgmt.c

Simple merge
Simple merge
Simple merge
Simple merge