From: Tejun Heo <tj@kernel.org>
Date: Wed, 3 Jul 2013 02:54:16 +0000 (-0700)
Subject: Merge branch 'libata/for-3.10-fixes' into libata/for-3.11
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~16^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a0a6a4f17a3606289f96356383db695a555bdbd;p=pandora-kernel.git

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>
---

5a0a6a4f17a3606289f96356383db695a555bdbd
Reading git-diff-tree failed