| commit | 0555891184a5c18df0e2349872e7ecf9701fc5b5 | [log] [tgz] |
|---|---|---|
| author | Gustavo F. Padovan <padovan@profusion.mobi> | Tue Jun 21 14:52:56 2011 -0300 |
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | Tue Jun 21 14:52:56 2011 -0300 |
| tree | 4ce942176ec5605e81ecc3f1ed17930d852a1259 | |
| parent | e13e21dc5d06bd9ed4a88daf057b8dbe80c220de [diff] | |
| parent | 330605423ca6eafafb8dcc27502bce1c585d1b06 [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6 Conflicts: net/bluetooth/l2cap_core.c