Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...
authorDavid S. Miller <davem@davemloft.net>
Sun, 6 Jul 2008 04:41:53 +0000 (21:41 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 6 Jul 2008 04:41:53 +0000 (21:41 -0700)

Trivial merge