Merge branch 'master' of git://github.com/padovan/bluetooth-next
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 4 Oct 2011 18:06:47 +0000 (14:06 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 4 Oct 2011 18:06:47 +0000 (14:06 -0400)

Trivial merge