commit | 782a9e31e81956a271375c0ba8d46fbb0480983e | [log] [tgz] |
---|---|---|
author | John W. Linville <linville@tuxdriver.com> | Tue Jan 04 14:25:28 2011 -0500 |
committer | John W. Linville <linville@tuxdriver.com> | Tue Jan 04 14:25:28 2011 -0500 |
tree | 0db1e951862111d3ea44fdcedeaee6ea55821165 | |
parent | 5c4bc1ce917d93ce8f7dd498fbec6881b3d7743a [diff] | |
parent | 17f9cc3124c97f50a19a7597e5f29f915b5b835c [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6