Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Tue, 22 Mar 2011 21:36:18 +0000 (14:36 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 22 Mar 2011 21:36:18 +0000 (14:36 -0700)

Trivial merge