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)
1  2 
net/bluetooth/l2cap_core.c
net/bluetooth/rfcomm/core.c
net/bluetooth/rfcomm/sock.c
net/bluetooth/smp.c

Simple merge
Simple merge
Simple merge
Simple merge