Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 1 Dec 2014 20:49:58 +0000 (15:49 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 1 Dec 2014 20:49:58 +0000 (15:49 -0500)

Trivial merge