Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 19 May 2014 20:34:27 +0000 (16:34 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 19 May 2014 20:34:27 +0000 (16:34 -0400)

Trivial merge