Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Fri, 7 Nov 2008 09:39:27 +0000 (01:39 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 7 Nov 2008 09:39:27 +0000 (01:39 -0800)

Trivial merge