Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Tue, 1 Mar 2011 20:38:18 +0000 (12:38 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 1 Mar 2011 20:38:18 +0000 (12:38 -0800)

Trivial merge