Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 6 Mar 2006 20:10:42 +0000 (12:10 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 6 Mar 2006 20:10:42 +0000 (12:10 -0800)
commitb6f57864eeacd556013c4b40917d50d7c8c38f8c
treef06af675059a506bfb0b70489796f97f13214a2f
parent264132bc62fe071d0ff378c1103bae9d33212f10
parent2d66806d740eeb410aa785bd7fba3bd24bb082c1
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