]> err.no Git - linux-2.6/commitdiff
Automatic merge of 'for-linus' branch from
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 26 May 2005 17:27:39 +0000 (10:27 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 26 May 2005 17:27:39 +0000 (10:27 -0700)
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6


Trivial merge