Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 13 Dec 2010 19:41:23 +0000 (14:41 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 13 Dec 2010 19:41:23 +0000 (14:41 -0500)

Trivial merge