Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Fri, 14 Nov 2008 23:36:57 +0000 (15:36 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 14 Nov 2008 23:36:57 +0000 (15:36 -0800)

Trivial merge