Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 28 Dec 2009 20:09:11 +0000 (15:09 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 28 Dec 2009 20:09:11 +0000 (15:09 -0500)

Trivial merge