Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 15 Oct 2010 20:00:02 +0000 (16:00 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 15 Oct 2010 20:00:02 +0000 (16:00 -0400)

Trivial merge