From: Linus Torvalds Date: Tue, 13 Dec 2005 05:42:17 +0000 (-0800) Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.15-rc6~94 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7cd082f0147c5fc94b455bcc17fe21b22dbac703;p=users%2Fjedix%2Flinux-maple.git Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 --- 7cd082f0147c5fc94b455bcc17fe21b22dbac703