Merge branch 'for-3.1' of git://github.com/padovan/bluetooth-next
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Sep 2011 18:47:29 +0000 (14:47 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Sep 2011 18:47:29 +0000 (14:47 -0400)

Trivial merge