Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 10 Jul 2014 21:00:34 +0000 (17:00 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 10 Jul 2014 21:00:34 +0000 (17:00 -0400)

Trivial merge