Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorJohn W. Linville <[email protected]>
Mon, 15 Sep 2014 18:55:45 +0000 (14:55 -0400)
committerJohn W. Linville <[email protected]>
Mon, 15 Sep 2014 18:55:45 +0000 (14:55 -0400)

Trivial merge