Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 5 Jul 2011 18:33:09 +0000 (14:33 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 5 Jul 2011 18:33:09 +0000 (14:33 -0400)

Trivial merge