| commit | 4b0b2f088f12e2ada1297502d7bebde182cf65b0 | [log] [tgz] |
|---|---|---|
| author | Gustavo F. Padovan <padovan@profusion.mobi> | Mon Dec 19 11:37:53 2011 -0200 |
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | Mon Dec 19 11:37:53 2011 -0200 |
| tree | c3f5bdb06a047eaca8a2e09b6dfd285d0cc26037 | |
| parent | 4dad99928211a20a91ec4515ab3b53fd65988f34 [diff] | |
| parent | d7660918fce210f421cc58c060ca3de71e4ffd37 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth Conflicts: net/bluetooth/l2cap_core.c