Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 27 Jun 2011 19:03:40 +0000 (15:03 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 27 Jun 2011 19:03:40 +0000 (15:03 -0400)

Trivial merge