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

Trivial merge