| commit | 704278ccb5c9fcbe09d1be3657950c17fad18ba8 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Jul 31 15:11:50 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Jul 31 15:11:50 2013 -0400 |
| tree | 1e15c5196541b928f076ae8d50e56a4cf9fbe7b8 | |
| parent | d6158a55738863b3fe2d48bbb3bf33005ef834b8 [diff] | |
| parent | 53e21fbc288218a423959f878c86471a0e323a9a [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth Conflicts: net/bluetooth/hci_core.c