commit | 15cb309614f35df344b9f06a9ea9f077d1e449db | [log] [tgz] |
---|---|---|
author | John W. Linville <linville@tuxdriver.com> | Thu May 12 14:06:10 2011 -0400 |
committer | John W. Linville <linville@tuxdriver.com> | Thu May 12 14:06:10 2011 -0400 |
tree | 85e244564f42381be5bf9d81ed867bb793fa976d | |
parent | 4daf50f20256e0022c87c1609226e971a70c82fd [diff] | |
parent | 55183d06cd1bd939ceccdad628b0aae12c86b803 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6