Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 19 Jan 2010 20:58:41 +0000 (15:58 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 19 Jan 2010 20:58:41 +0000 (15:58 -0500)

Trivial merge