Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...
authorDavid S. Miller <davem@davemloft.net>
Wed, 4 Jun 2008 21:58:13 +0000 (14:58 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 4 Jun 2008 21:58:13 +0000 (14:58 -0700)

Trivial merge