Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Wed, 12 Nov 2008 00:29:03 +0000 (16:29 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 12 Nov 2008 00:29:03 +0000 (16:29 -0800)

Trivial merge