Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...
authorDavid S. Miller <davem@davemloft.net>
Sun, 29 Jun 2008 05:57:58 +0000 (22:57 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 29 Jun 2008 05:57:58 +0000 (22:57 -0700)

Trivial merge