]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 30 Jan 2013 19:21:04 +0000 (14:21 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 30 Jan 2013 19:21:04 +0000 (14:21 -0500)
commit0f496df2d9ba48faa808b5fa330de0da1a2d29d7
treec1c85a625cff3f2ca6d95a5d5020a0157baa7521
parent56e1bd770614da94f35e88c150cf9edf8d0b57a2
parent9b008c0457e583e10e62d1215bed6ab26ee54906
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
net/bluetooth/hci_core.c
net/bluetooth/hci_event.c
net/bluetooth/l2cap_core.c