]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 5 Jun 2014 18:10:07 +0000 (14:10 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 5 Jun 2014 18:10:07 +0000 (14:10 -0400)
commit67be1e4f4b0a512f6af3a7db681ae9b62d31de5e
tree690ef67ff6b630344e8fd86c7c84b0d31f468f24
parenta715c7ddd65a1a3b2839b8ebd759bb2d361f7675
parent8a96f3cd22878fc0bb564a8478a6e17c0b8dca73
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
drivers/bluetooth/ath3k.c
net/bluetooth/6lowpan.c
net/bluetooth/hci_event.c
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c