Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...
authorDavid S. Miller <davem@davemloft.net>
Fri, 27 Jun 2008 11:26:58 +0000 (04:26 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 27 Jun 2008 11:26:58 +0000 (04:26 -0700)

Trivial merge