Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Tue, 8 Dec 2009 21:44:44 +0000 (13:44 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 8 Dec 2009 21:44:44 +0000 (13:44 -0800)

Trivial merge