tree f06af675059a506bfb0b70489796f97f13214a2f
parent 264132bc62fe071d0ff378c1103bae9d33212f10
parent 2d66806d740eeb410aa785bd7fba3bd24bb082c1
author Linus Torvalds <torvalds@g5.osdl.org> 1141675842 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1141675842 -0800

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