| commit | a5eb1aeb25df89c627248a162cc35ffb556dc486 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu May 29 13:03:47 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu May 29 13:03:47 2014 -0400 |
| tree | 934fd6b18f17f72d5e57708b8e3a12b0071f1327 | |
| parent | 737be10d8cb783d1cadb1868b061abb2b4314eae [diff] | |
| parent | d7b2545023ecfde94d3ea9c03c5480ac18da96c9 [diff] |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next Conflicts: drivers/bluetooth/btusb.c