diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/ata/ahci.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.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 | * |