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)
commit3b931b5e206943b6092295e3ce5a765391283c6d
tree960f3cf306f4feaa6c3b1e7d4f457d7239d03c39
parentbbe25481db83278da5a8f8513e5d94991295bb6d
parentd139e6de91a70221470a0d50b542d74c7a1fe51d
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