Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...
authorDavid S. Miller <davem@davemloft.net>
Mon, 30 Jun 2008 20:18:53 +0000 (13:18 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 30 Jun 2008 20:18:53 +0000 (13:18 -0700)

Trivial merge