diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-06-09 21:33:54 +0200 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-06-09 21:33:54 +0200 |
| commit | 448f2627c169092d2091a1be22feb6a7775f6201 (patch) | |
| tree | 8d12460ba978d4f031715ae4bd9e0bc6fee4c5ab /net/wireless | |
| parent | Bluetooth: Clean up some code style issues (diff) | |
| parent | Bluetooth: Do not send SET_EVENT_MASK for 1.1 and earlier devices (diff) | |
| download | linux-448f2627c169092d2091a1be22feb6a7775f6201.tar.xz linux-448f2627c169092d2091a1be22feb6a7775f6201.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Conflicts:
net/bluetooth/rfcomm/sock.c
Diffstat (limited to 'net/wireless')
0 files changed, 0 insertions, 0 deletions