Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 22 Jun 2011 20:06:58 +0000 (16:06 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 22 Jun 2011 20:06:58 +0000 (16:06 -0400)

Trivial merge