commit | d6124baf8a098aacdbb85ff5b171da68dad6930e | [log] [tgz] |
---|---|---|
author | John W. Linville <linville@tuxdriver.com> | Fri Jun 10 15:05:34 2011 -0400 |
committer | John W. Linville <linville@tuxdriver.com> | Fri Jun 10 15:05:34 2011 -0400 |
tree | e0b943d6e1bfbe1061995d3f3e16532b36775bc6 | |
parent | 51e65257142a87fe46a1ce5c35c86c5baf012614 [diff] | |
parent | 7f4f0572df6c8eaa6a587bc212b0806ff37380dd [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6