Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6 into test
Gustavo F. Padovan [Wed, 1 Dec 2010 23:04:09 +0000 (21:04 -0200)]

Trivial merge