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

Trivial merge