From: Simon Horman <horms+renesas@verge.net.au>
Date: Fri, 5 Dec 2014 08:49:04 +0000 (+0900)
Subject: Merge tag 'backport/v3.14.24-ltsi-rc1/sata-rcar-to-v3.18-rc5' into backport/v3.14... 
X-Git-Tag: upstream/snapshot3+hdmi~12
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git;a=commitdiff_plain;h=3b931b5e206943b6092295e3ce5a765391283c6d

Merge tag 'backport/v3.14.24-ltsi-rc1/sata-rcar-to-v3.18-rc5' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

Conflicts:
	Documentation/devicetree/bindings/ata/sata_rcar.txt
---

3b931b5e206943b6092295e3ce5a765391283c6d