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

Trivial merge