From: Linus Torvalds Date: Mon, 7 Nov 2005 16:04:01 +0000 (-0800) Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.15-rc1~453 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cde0776ec1e86c270f65bf482f96288e6bf0023;p=linux-2.6 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 --- 8cde0776ec1e86c270f65bf482f96288e6bf0023