Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...
authorGustavo F. Padovan <padovan@profusion.mobi>
Tue, 8 Feb 2011 03:38:50 +0000 (01:38 -0200)
committerGustavo F. Padovan <padovan@profusion.mobi>
Tue, 8 Feb 2011 03:38:50 +0000 (01:38 -0200)

Trivial merge