Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 5 Nov 2013 20:50:22 +0000 (15:50 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 5 Nov 2013 20:50:22 +0000 (15:50 -0500)

Trivial merge