Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...
authorDavid S. Miller <davem@davemloft.net>
Thu, 1 May 2008 23:04:59 +0000 (16:04 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 1 May 2008 23:04:59 +0000 (16:04 -0700)

Trivial merge