From: Linus Torvalds Date: Fri, 11 Nov 2005 17:26:39 +0000 (-0800) Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=388f7ef720a982f49925e7b4e96f216f208f8c03;p=linux-edison.git Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/netdev-2.6 --- 388f7ef720a982f49925e7b4e96f216f208f8c03