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/libata-core.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/libata-core.c')
| -rw-r--r-- | drivers/ata/libata-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index b91e19cab10..423c0a6952b 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
| @@ -5340,7 +5340,7 @@ int ata_host_suspend(struct ata_host *host, pm_message_t mesg) | |||
| 5340 | * | 5340 | * |
| 5341 | * Resume @host. Actual operation is performed by EH. This | 5341 | * Resume @host. Actual operation is performed by EH. This |
| 5342 | * function requests EH to perform PM operations and returns. | 5342 | * function requests EH to perform PM operations and returns. |
| 5343 | * Note that all resume operations are performed parallely. | 5343 | * Note that all resume operations are performed parallelly. |
| 5344 | * | 5344 | * |
| 5345 | * LOCKING: | 5345 | * LOCKING: |
| 5346 | * Kernel thread context (may sleep). | 5346 | * Kernel thread context (may sleep). |