Merge tag 'backport/v3.14.24-ltsi-rc1/sata-rcar-to-v3.18-rc5' into backport/v3.14...
authorSimon Horman <horms+renesas@verge.net.au>
Fri, 5 Dec 2014 08:49:04 +0000 (17:49 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Fri, 5 Dec 2014 08:49:04 +0000 (17:49 +0900)
Conflicts:
Documentation/devicetree/bindings/ata/sata_rcar.txt


Trivial merge