Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 28 Feb 2011 19:05:38 +0000 (14:05 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 28 Feb 2011 19:05:38 +0000 (14:05 -0500)

Trivial merge