From: Linus Torvalds Date: Fri, 22 Sep 2006 22:37:31 +0000 (-0700) Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.19-rc1~1294 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3e2ab46df697048e222cdc046a2fa97149ca32ba;p=linux-2.6-omap-h63xx.git Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [netdrvr] mv643xx_eth: fix obvious typo, which caused build breakage [netdrvr] lp486e: fix typo --- 3e2ab46df697048e222cdc046a2fa97149ca32ba