diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-06-21 21:52:56 +0400 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-06-21 21:52:56 +0400 |
| commit | 0555891184a5c18df0e2349872e7ecf9701fc5b5 (patch) | |
| tree | 4ce942176ec5605e81ecc3f1ed17930d852a1259 /net/mac80211 | |
| parent | e13e21dc5d06bd9ed4a88daf057b8dbe80c220de (diff) | |
| parent | 330605423ca6eafafb8dcc27502bce1c585d1b06 (diff) | |
| download | linux-0555891184a5c18df0e2349872e7ecf9701fc5b5.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Conflicts:
net/bluetooth/l2cap_core.c
Diffstat (limited to 'net/mac80211')
0 files changed, 0 insertions, 0 deletions