]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c60ecec d8cf538)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 15 Jan 2008 05:26:08 +0000 (21:26 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 15 Jan 2008 05:26:08 +0000 (21:26 -0800)
commit5d5d80001df3fbd06bd2b8893b6e3847e38a12d6
tree1adceb5d74b574bb99b67dd0a7456e60f2fbd39ftree | snapshot
parentc60ecec67ab3f6b5791ef49d502b7a61909aa13ecommit | diff
parentd8cf5389bd9d1f0ac9fea51796c274ba64b83d80commit | diff
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: relocate sdev->manage_start_stop configuration
  sata_sil24: freeze on non-dev errors reported via CERR
  sata_sil24: fix stupid typo
  ata_piix: ignore ATA_DMA_ERR on vmware ich4
Linux 2.6 source tree