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/ahci.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/ahci.c')
| -rw-r--r-- | drivers/ata/ahci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index e62f693be8ea..39d829cd82dd 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
| @@ -926,7 +926,7 @@ static bool ahci_broken_suspend(struct pci_dev *pdev) | |||
| 926 | /* | 926 | /* |
| 927 | * Acer eMachines G725 has the same problem. BIOS | 927 | * Acer eMachines G725 has the same problem. BIOS |
| 928 | * V1.03 is known to be broken. V3.04 is known to | 928 | * V1.03 is known to be broken. V3.04 is known to |
| 929 | * work. Inbetween, there are V1.06, V2.06 and V3.03 | 929 | * work. Between, there are V1.06, V2.06 and V3.03 |
| 930 | * that we don't have much idea about. For now, | 930 | * that we don't have much idea about. For now, |
| 931 | * blacklist anything older than V3.04. | 931 | * blacklist anything older than V3.04. |
| 932 | * | 932 | * |