Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Thu, 29 Oct 2009 09:47:13 +0000 (02:47 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 29 Oct 2009 09:47:13 +0000 (02:47 -0700)

Trivial merge