Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 30 Apr 2014 15:56:43 +0000 (11:56 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 30 Apr 2014 15:56:43 +0000 (11:56 -0400)

Trivial merge