Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...
John W. Linville [Thu, 12 May 2011 18:06:10 +0000 (14:06 -0400)]

Trivial merge