]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 264132b 2d66806)
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)
* '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


Trivial merge
Linux 2.6 source tree