Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...
authorDavid S. Miller <davem@davemloft.net>
Wed, 21 May 2008 03:34:22 +0000 (20:34 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 21 May 2008 03:34:22 +0000 (20:34 -0700)

Trivial merge