Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
authorGustavo F. Padovan <padovan@profusion.mobi>
Fri, 2 Dec 2011 23:26:25 +0000 (08:26 +0900)
committerGustavo F. Padovan <padovan@profusion.mobi>
Fri, 2 Dec 2011 23:26:25 +0000 (08:26 +0900)

Trivial merge