Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Thu, 11 Sep 2008 22:46:02 +0000 (15:46 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 11 Sep 2008 22:46:02 +0000 (15:46 -0700)

Trivial merge