]> err.no Git - linux-2.6/commitdiff
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Fri, 15 Feb 2008 23:59:19 +0000 (15:59 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 15 Feb 2008 23:59:19 +0000 (15:59 -0800)

Trivial merge