| commit | 533b12c88d895cf42d5f439e25be2a2ea026b9e8 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Aug 10 14:55:10 2010 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Aug 10 16:16:58 2010 -0400 |
| tree | 6d678d8e5e530caee30b85755a481af2219317e0 | |
| parent | 94597ab23ea10b3bdcba534be00a9f7b35791c07 [diff] | |
| parent | db12d647ccc971ed120199dc7ea5be2b5887d328 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6