]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 18 Dec 2013 18:46:08 +0000 (13:46 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 18 Dec 2013 18:46:08 +0000 (13:46 -0500)
1  2 
net/bluetooth/hci_sock.c

Simple merge