diff options
author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/ide/piix.c | |
parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/ide/piix.c')
-rw-r--r-- | drivers/ide/piix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c index 1bdca49e5a03..b59d04c72051 100644 --- a/drivers/ide/piix.c +++ b/drivers/ide/piix.c | |||
@@ -8,8 +8,8 @@ | |||
8 | * | 8 | * |
9 | * Documentation: | 9 | * Documentation: |
10 | * | 10 | * |
11 | * Publically available from Intel web site. Errata documentation | 11 | * Publicly available from Intel web site. Errata documentation |
12 | * is also publically available. As an aide to anyone hacking on this | 12 | * is also publicly available. As an aide to anyone hacking on this |
13 | * driver the list of errata that are relevant is below.going back to | 13 | * driver the list of errata that are relevant is below.going back to |
14 | * PIIX4. Older device documentation is now a bit tricky to find. | 14 | * PIIX4. Older device documentation is now a bit tricky to find. |
15 | * | 15 | * |