Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Wed, 15 Oct 2008 06:19:16 +0000 (23:19 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 15 Oct 2008 06:19:16 +0000 (23:19 -0700)

Trivial merge