From: Linus Torvalds Date: Thu, 12 Jan 2006 23:43:39 +0000 (-0800) Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.16-rc1~176 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=43ecb9a33ba8c93ebbda81d48ca05f0d1bbf9056;p=users%2Fjedix%2Flinux-maple.git Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 --- 43ecb9a33ba8c93ebbda81d48ca05f0d1bbf9056