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)
commitf49809fe9b39e22b0f6f75c86295ce216ce3e374
tree05f8c05ee71307c9ab02663cfaa5f08a21c6629f
parentcdbbde14cb55dd10771ce79154f787322d88411b
parentc1ef1f351db70ad60c793b8218dd9f6739cfd66d
Automatic merge of 'for-linus' branch from

rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6