]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1c1afa3 fd3367a)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.osdl.org>
Thu, 7 Dec 2006 17:16:07 +0000 (09:16 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Thu, 7 Dec 2006 17:16:07 +0000 (09:16 -0800)
commit2fd8507d14ef7af3ae05316b3277044cf6daa381
tree8dc061d6c983f9be9a75109b2caef373cd7dfd80tree | snapshot
parent1c1afa3c053d4ccdf44e5a4e159005cdfd48bfc6commit | diff
parentfd3367af3d1212f645094c4b5c4d458bdd061475commit | diff
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] libata: Incorrect timing computation for PIO5/6
  [PATCH] sata_promise: new EH conversion, take 2
  [PATCH] libata: let ATA_FLAG_PIO_POLLING use polling pio for ATA_PROT_NODATA
  [PATCH] sata_promise: cleanups, take 2
Unnamed repository; edit this file 'description' to name the repository.