]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5b3875c c4d4e7e)
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)
commit7c21f74cc97ec9d4aa24d9a5b650c7dd0947ea18
tree1adceb5d74b574bb99b67dd0a7456e60f2fbd39ftree | snapshot
parent5b3875cf5a71dc4602264b20b8cc3ac90df8bbeacommit | diff
parentc4d4e7ec076928050d092716db85ae69e185202acommit | 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 Kernel Source Tree.