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

Trivial merge