Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Jul 2010 20:17:49 +0000 (16:17 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Jul 2010 20:17:49 +0000 (16:17 -0400)

Trivial merge