Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Nov 2014 21:30:48 +0000 (16:30 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Nov 2014 21:30:48 +0000 (16:30 -0500)

Trivial merge