summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mvebu/platsmp.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-07-02 19:54:16 -0700
committerTejun Heo <tj@kernel.org>2013-07-02 19:54:16 -0700
commit5a0a6a4f17a3606289f96356383db695a555bdbd (patch)
tree0f8e206d65ef29bf81a13213af00db56c90af06c /arch/arm/mach-mvebu/platsmp.c
parent9bbb1b0e2a83c5b3922a050acc932ee3004e85b6 (diff)
parent1cfc7df3de10c40ed459e13cce6de616023bf41c (diff)
downloadblackbird-op-linux-5a0a6a4f17a3606289f96356383db695a555bdbd.tar.gz
blackbird-op-linux-5a0a6a4f17a3606289f96356383db695a555bdbd.zip
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 'arch/arm/mach-mvebu/platsmp.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud