aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 12:16:07 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 12:16:07 -0500
commit2fd8507d14ef7af3ae05316b3277044cf6daa381 (patch)
tree8dc061d6c983f9be9a75109b2caef373cd7dfd80 /include/linux
parent1c1afa3c053d4ccdf44e5a4e159005cdfd48bfc6 (diff)
parentfd3367af3d1212f645094c4b5c4d458bdd061475 (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
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions