Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 3 Jan 2012 19:26:56 +0000 (14:26 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 3 Jan 2012 19:26:56 +0000 (14:26 -0500)

Trivial merge