From: Linus Torvalds Date: Thu, 8 Sep 2005 00:22:43 +0000 (-0700) Subject: Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 X-Git-Tag: v2.6.14-rc1~527 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=55faed1e607a24ca7f3453a3eb463ca8987f8139 Merge branch 'upstream' of /linux/kernel/git/jgarzik/netdev-2.6 --- 55faed1e607a24ca7f3453a3eb463ca8987f8139