Merge branch 'wireless-next' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 5 Oct 2010 17:50:27 +0000 (13:50 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 5 Oct 2010 17:50:27 +0000 (13:50 -0400)

Trivial merge