Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Thu, 23 Oct 2008 07:44:04 +0000 (00:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 23 Oct 2008 07:44:04 +0000 (00:44 -0700)

Trivial merge