From: Linus Torvalds Date: Wed, 3 Oct 2007 22:43:36 +0000 (-0700) Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.23~33 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3e0ca2f148f97c5748f52bcf2a69dd17cb2b1d13;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: sky2: jumbo frame regression fix [PATCH] softmac: Fix compiler-warning [PATCH] bcm43xx: Correct printk with PFX before KERN_ --- 3e0ca2f148f97c5748f52bcf2a69dd17cb2b1d13