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

Trivial merge