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/ata/pata_mpiix.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/ata/pata_mpiix.c')
| -rw-r--r-- | drivers/ata/pata_mpiix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c index b21f0021f54a..d8d9c5807740 100644 --- a/drivers/ata/pata_mpiix.c +++ b/drivers/ata/pata_mpiix.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | * with PCI IDE and also that we do not disable the device when our driver is | 15 | * with PCI IDE and also that we do not disable the device when our driver is |
| 16 | * unloaded (as it has many other functions). | 16 | * unloaded (as it has many other functions). |
| 17 | * | 17 | * |
| 18 | * The driver conciously keeps this logic internally to avoid pushing quirky | 18 | * The driver consciously keeps this logic internally to avoid pushing quirky |
| 19 | * PATA history into the clean libata layer. | 19 | * PATA history into the clean libata layer. |
| 20 | * | 20 | * |
| 21 | * Thinkpad specific note: If you boot an MPIIX using a thinkpad with a PCMCIA | 21 | * Thinkpad specific note: If you boot an MPIIX using a thinkpad with a PCMCIA |