diff options
| author | Tejun Heo <tj@kernel.org> | 2013-07-02 19:54:16 -0700 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2013-07-02 19:54:16 -0700 |
| commit | 5a0a6a4f17a3606289f96356383db695a555bdbd (patch) | |
| tree | 0f8e206d65ef29bf81a13213af00db56c90af06c /drivers/ata/libata-scsi.c | |
| parent | 9bbb1b0e2a83c5b3922a050acc932ee3004e85b6 (diff) | |
| parent | 1cfc7df3de10c40ed459e13cce6de616023bf41c (diff) | |
Merge branch 'libata/for-3.10-fixes' into libata/for-3.11
libata/for-3.10-fixes never got submitted during v3.10 cycle. Merge
it into for-3.11 so that it can be routed together with other changes
scheduled for v3.11.
Three trivial conflicts in drivers/ata/sata_rcar.c. All are caused by
1b20f6a9ad ("sata_rcar: add 'base' local variable to some functions")
conflicting with logic updates in for-3.10-fixes. The offending
commit simply adds local variable @base on functions which
dereferences sata_rcar_priv->base multiple times. The resolutions are
trivial - applying s/priv->base/base/ in the conflicting logic
updates.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata/libata-scsi.c')
| -rw-r--r-- | drivers/ata/libata-scsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 006f1bf9d78..83c08907e04 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -1,7 +1,7 @@ /* * libata-scsi.c - helper library for ATA * - * Maintained by: Jeff Garzik <jgarzik@pobox.com> + * Maintained by: Tejun Heo <tj@kernel.org> * Please ALWAYS copy linux-ide@vger.kernel.org * on emails. * |