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

Trivial merge