| commit | 67be1e4f4b0a512f6af3a7db681ae9b62d31de5e | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu Jun 05 14:10:07 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu Jun 05 14:10:07 2014 -0400 |
| tree | 690ef67ff6b630344e8fd86c7c84b0d31f468f24 | |
| parent | a715c7ddd65a1a3b2839b8ebd759bb2d361f7675 [diff] | |
| parent | 8a96f3cd22878fc0bb564a8478a6e17c0b8dca73 [diff] |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next