From: Linus Torvalds Date: Mon, 6 Mar 2006 20:10:42 +0000 (-0800) Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.16-rc6~111 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6f57864eeacd556013c4b40917d50d7c8c38f8c;p=linux-2.6 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [PATCH] chelsio: fix kmalloc failure in t1_espi_create Merge branch 'master' s2io: set_multicast_list bug --- b6f57864eeacd556013c4b40917d50d7c8c38f8c