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

Trivial merge