| commit | 448f2627c169092d2091a1be22feb6a7775f6201 | [log] [tgz] |
|---|---|---|
| author | Gustavo F. Padovan <padovan@profusion.mobi> | Thu Jun 09 16:33:54 2011 -0300 |
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | Thu Jun 09 16:33:54 2011 -0300 |
| tree | 8d12460ba978d4f031715ae4bd9e0bc6fee4c5ab | |
| parent | 5a9d0a3ffbc40ea1f5a0636501e7599cbb327bcc [diff] | |
| parent | 6de6c18d8d3b2a82cc1c657f005e61b1c1f2f886 [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6 Conflicts: net/bluetooth/rfcomm/sock.c