Merge branch 'wireless-next' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 11 Oct 2010 18:43:46 +0000 (14:43 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 11 Oct 2010 18:43:46 +0000 (14:43 -0400)

Trivial merge