Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 16 May 2011 18:21:02 +0000 (14:21 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 16 May 2011 18:21:02 +0000 (14:21 -0400)

Trivial merge