From: Linus Torvalds Date: Thu, 1 Dec 2005 23:49:37 +0000 (-0800) Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.15-rc5~20 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f327220b1494aa23fd4206ac4778b8aa449a3351;p=linux-2.6-omap-h63xx.git Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 --- f327220b1494aa23fd4206ac4778b8aa449a3351