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

Trivial merge