Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...
authorDavid S. Miller <davem@davemloft.net>
Thu, 24 Apr 2008 02:44:58 +0000 (19:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 24 Apr 2008 02:44:58 +0000 (19:44 -0700)

Trivial merge