From: Linus Torvalds Date: Thu, 5 Jan 2006 00:31:56 +0000 (-0800) Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.16-rc1~474^2~22^2~7 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d779188d2baf436e67fe8816fca2ef53d246900f;p=linux-2.6-omap-h63xx.git Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 --- d779188d2baf436e67fe8816fca2ef53d246900f