Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 13 Jun 2012 19:12:07 +0000 (15:12 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 13 Jun 2012 19:12:07 +0000 (15:12 -0400)

Trivial merge