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

Trivial merge