| commit | 1025c04cecd19882e28f16c4004034b475c372c5 | [log] [tgz] |
|---|---|---|
| author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | Fri Sep 27 11:56:14 2013 -0300 |
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | Fri Sep 27 11:56:14 2013 -0300 |
| tree | 2b7402887e86d54bff5a123228c9059eae5e32bd | |
| parent | 4375f1037d52602413142e290608d0d84671ad36 [diff] | |
| parent | 5bcecf325378218a8e248bb6bcae96ec7362f8ef [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth Conflicts: net/bluetooth/hci_core.c