diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2011-11-09 14:54:33 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-09 14:54:33 -0500 |
| commit | 312fef7d18adda2be822d31916547f84ed6af28b (patch) | |
| tree | 095d936b751b0a92946fcf710fb74dea7f8f33f7 /include/linux | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (diff) | |
| parent | Bluetooth: Remove redundant hci_dev comparisons in mgmt lookups (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next
Conflicts:
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions