tree 0db1e951862111d3ea44fdcedeaee6ea55821165
parent 5c4bc1ce917d93ce8f7dd498fbec6881b3d7743a
parent 17f9cc3124c97f50a19a7597e5f29f915b5b835c
author John W. Linville <linville@tuxdriver.com> 1294169128 -0500
committer John W. Linville <linville@tuxdriver.com> 1294169128 -0500

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6