Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Tue, 25 May 2010 20:15:11 +0000 (13:15 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 25 May 2010 20:15:11 +0000 (13:15 -0700)

Trivial merge