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

Trivial merge