Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetoot...
John W. Linville [Fri, 10 Jun 2011 19:05:34 +0000 (15:05 -0400)]

Trivial merge