From: Linus Torvalds Date: Tue, 13 Dec 2005 00:41:37 +0000 (-0800) Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.15-rc6~98 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=238523e1a15874b88955ff9c8f63e35597ae2857;p=linux-2.6 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 --- 238523e1a15874b88955ff9c8f63e35597ae2857