Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 15 Nov 2013 19:18:45 +0000 (14:18 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 15 Nov 2013 19:18:45 +0000 (14:18 -0500)
commit32019c739c95d056575e0bb2381f2846c0c49944
treea3134c8c8c74094b936b73906954c7e77f531cf9
parent8e3ffa471091c560deb6738ed9ab7445b7a5fd04
parent86ca9eac31d0d8c4fe61b5726e6d63197bc435a6
Merge branch 'for-upstream' of git://git./linux/kernel/git/bluetooth/bluetooth
net/bluetooth/l2cap_core.c
net/bluetooth/rfcomm/core.c
net/bluetooth/rfcomm/sock.c
net/bluetooth/smp.c