Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 24 Jun 2013 17:53:15 +0000 (13:53 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 24 Jun 2013 17:53:15 +0000 (13:53 -0400)

Trivial merge