Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Fri, 10 Dec 2010 20:51:02 +0000 (12:51 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 10 Dec 2010 20:51:02 +0000 (12:51 -0800)

Trivial merge