From: Linus Torvalds Date: Tue, 7 Feb 2006 18:04:04 +0000 (-0800) Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.16-rc3~139 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=50753817a3043e0621e99f329514c0c7003563b2;p=linux-2.6-omap-h63xx.git Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 --- 50753817a3043e0621e99f329514c0c7003563b2