Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 21 Nov 2012 18:03:00 +0000 (13:03 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 21 Nov 2012 18:03:00 +0000 (13:03 -0500)

Trivial merge