commit | c30ae138aa0570665725166679bdf4207041c8df | [log] [tgz] |
---|---|---|
author | John W. Linville <linville@tuxdriver.com> | Thu Dec 02 15:17:46 2010 -0500 |
committer | John W. Linville <linville@tuxdriver.com> | Thu Dec 02 15:17:46 2010 -0500 |
tree | 06d887921a968298758e6b247a18b5f7cae449df | |
parent | 78b8595691c34478a51d1c2bcbbb0f6ec8a28247 [diff] | |
parent | be21871f24b0fcd8d0d09c8090385c9cec80efa3 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6