Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 4 Jan 2011 19:25:28 +0000 (14:25 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 4 Jan 2011 19:25:28 +0000 (14:25 -0500)
commit782a9e31e81956a271375c0ba8d46fbb0480983e
tree0db1e951862111d3ea44fdcedeaee6ea55821165
parent5c4bc1ce917d93ce8f7dd498fbec6881b3d7743a
parent17f9cc3124c97f50a19a7597e5f29f915b5b835c
Merge branch 'master' of /linux/kernel/git/padovan/bluetooth-next-2.6