Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 5 Aug 2010 19:54:28 +0000 (15:54 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 5 Aug 2010 19:54:28 +0000 (15:54 -0400)

Trivial merge