Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Tue, 22 Jun 2010 17:54:12 +0000 (10:54 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 22 Jun 2010 17:54:12 +0000 (10:54 -0700)

Trivial merge