Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 10 Aug 2010 18:55:10 +0000 (14:55 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 10 Aug 2010 20:16:58 +0000 (16:16 -0400)

Trivial merge