projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
Documentation
/
DocBook
/
libata.tmpl
diff --git
a/Documentation/DocBook/libata.tmpl
b/Documentation/DocBook/libata.tmpl
index
e97c323
..
07a6355
100644
(file)
--- a/
Documentation/DocBook/libata.tmpl
+++ b/
Documentation/DocBook/libata.tmpl
@@
-14,7
+14,7
@@
</authorgroup>
<copyright>
</authorgroup>
<copyright>
- <year>2003-200
5
</year>
+ <year>2003-200
6
</year>
<holder>Jeff Garzik</holder>
</copyright>
<holder>Jeff Garzik</holder>
</copyright>
@@
-868,18
+868,18
@@
and other resources, etc.
<chapter id="libataExt">
<title>libata Library</title>
<chapter id="libataExt">
<title>libata Library</title>
-!Edrivers/
scsi
/libata-core.c
+!Edrivers/
ata
/libata-core.c
</chapter>
<chapter id="libataInt">
<title>libata Core Internals</title>
</chapter>
<chapter id="libataInt">
<title>libata Core Internals</title>
-!Idrivers/
scsi
/libata-core.c
+!Idrivers/
ata
/libata-core.c
</chapter>
<chapter id="libataScsiInt">
<title>libata SCSI translation/emulation</title>
</chapter>
<chapter id="libataScsiInt">
<title>libata SCSI translation/emulation</title>
-!Edrivers/
scsi
/libata-scsi.c
-!Idrivers/
scsi
/libata-scsi.c
+!Edrivers/
ata
/libata-scsi.c
+!Idrivers/
ata
/libata-scsi.c
</chapter>
<chapter id="ataExceptions">
</chapter>
<chapter id="ataExceptions">
@@
-1400,7
+1400,7
@@
and other resources, etc.
<listitem>
<para>
When it's known that HBA is in ready state but ATA/ATAPI
<listitem>
<para>
When it's known that HBA is in ready state but ATA/ATAPI
- device i
n
in unknown state, reset only device.
+ device i
s
in unknown state, reset only device.
</para>
</listitem>
</para>
</listitem>
@@
-1600,12
+1600,12
@@
and other resources, etc.
<chapter id="PiixInt">
<title>ata_piix Internals</title>
<chapter id="PiixInt">
<title>ata_piix Internals</title>
-!Idrivers/
scsi
/ata_piix.c
+!Idrivers/
ata
/ata_piix.c
</chapter>
<chapter id="SILInt">
<title>sata_sil Internals</title>
</chapter>
<chapter id="SILInt">
<title>sata_sil Internals</title>
-!Idrivers/
scsi
/sata_sil.c
+!Idrivers/
ata
/sata_sil.c
</chapter>
<chapter id="libataThanks">
</chapter>
<chapter id="libataThanks">