Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Tue, 13 Oct 2009 18:41:34 +0000 (11:41 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Oct 2009 18:41:34 +0000 (11:41 -0700)

Trivial merge