Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 3 Feb 2011 21:35:20 +0000 (16:35 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 3 Feb 2011 21:35:20 +0000 (16:35 -0500)

Trivial merge