From: Linus Torvalds Date: Wed, 27 Jun 2007 16:59:52 +0000 (-0700) Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7af5f532a23c421ab9a70b1a9a78c722d26d95ff;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: 2.6.22: ERROR: "__ucmpdi2" [drivers/net/s2io.ko] undefined! cxgb3 - fix register to stop bc/mc traffic au1000_eth: Fix warnings. --- 7af5f532a23c421ab9a70b1a9a78c722d26d95ff