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

Trivial merge