Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 3 Oct 2013 20:19:07 +0000 (16:19 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 3 Oct 2013 20:19:07 +0000 (16:19 -0400)

Trivial merge