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

Trivial merge