Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 10 Aug 2012 19:13:12 +0000 (15:13 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 10 Aug 2012 19:13:12 +0000 (15:13 -0400)

Trivial merge