diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/ide/piix.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
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 | * |