diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-19 13:37:53 (GMT) |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-19 13:37:53 (GMT) |
| commit | 4b0b2f088f12e2ada1297502d7bebde182cf65b0 (patch) | |
| tree | c3f5bdb06a047eaca8a2e09b6dfd285d0cc26037 /drivers/parport | |
| parent | 4dad99928211a20a91ec4515ab3b53fd65988f34 (diff) | |
| parent | d7660918fce210f421cc58c060ca3de71e4ffd37 (diff) | |
| download | linux-fsl-qoriq-4b0b2f088f12e2ada1297502d7bebde182cf65b0.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
Conflicts:
net/bluetooth/l2cap_core.c
Diffstat (limited to 'drivers/parport')
0 files changed, 0 insertions, 0 deletions