Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 20 Apr 2011 19:56:44 +0000 (15:56 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 20 Apr 2011 19:56:44 +0000 (15:56 -0400)

Trivial merge