Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Tue, 17 Nov 2009 07:43:01 +0000 (23:43 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 Nov 2009 07:43:01 +0000 (23:43 -0800)

Trivial merge