Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...
authorDavid S. Miller <davem@davemloft.net>
Tue, 8 Jul 2008 22:39:41 +0000 (15:39 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 8 Jul 2008 22:39:41 +0000 (15:39 -0700)

Trivial merge