diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-02 14:16:37 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-02 14:16:47 +0200 |
| commit | ba67cf5cf2ce10ad86a212b70f8c7c75d93a5016 (patch) | |
| tree | 70242f5927c6d6454bd352ff78f956cfc5238f59 /drivers/scsi/libsas/sas_expander.c | |
| parent | aff364860aa105b2deacc6f21ec8ef524460e3fc (diff) | |
| parent | 2be19102b71c1a45d37fec50303791daa1a06869 (diff) | |
Merge branch 'x86/urgent' into x86-mm
Merge reason: Pick up the following two fix commits.
2be19102b7: x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo()
765af22da8: x86-32, NUMA: Fix ACPI NUMA init broken by recent x86-64 change
Scheduled NUMA init 32/64bit unification changes depend on these.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/scsi/libsas/sas_expander.c')
| -rw-r--r-- | drivers/scsi/libsas/sas_expander.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index f3f693b772a..874e29d9533 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -240,7 +240,7 @@ static int sas_ex_phy_discover_helper(struct domain_device *dev, u8 *disc_req, disc_resp, DISCOVER_RESP_SIZE); if (res) return res; - /* This is detecting a failure to transmit inital + /* This is detecting a failure to transmit initial * dev to host FIS as described in section G.5 of * sas-2 r 04b */ dr = &((struct smp_resp *)disc_resp)->disc; |