From: Linus Torvalds <torvalds@g5.osdl.org>
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: firefly_0821_release~37785
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b6f57864eeacd556013c4b40917d50d7c8c38f8c;p=firefly-linux-kernel-4.4.55.git

Merge branch 'upstream-fixes' of /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