Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Feb 2011 20:30:42 +0000 (15:30 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Feb 2011 20:30:42 +0000 (15:30 -0500)

Trivial merge