Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 4 Apr 2011 20:10:36 +0000 (16:10 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 4 Apr 2011 20:10:36 +0000 (16:10 -0400)

Trivial merge