Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Sun, 2 Nov 2008 21:13:07 +0000 (13:13 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 2 Nov 2008 21:13:07 +0000 (13:13 -0800)

Trivial merge