Merge tag 'backport/v3.14.24-ltsi-rc1/sh-sci-to-v3.18-rc1' into backport/v3.14.24...
authorSimon Horman <horms+renesas@verge.net.au>
Fri, 5 Dec 2014 01:59:02 +0000 (10:59 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Fri, 5 Dec 2014 01:59:02 +0000 (10:59 +0900)
commitdad78b1faff792676408e4312ff5a61175053d87
tree100e32307f5741a8a7d7753df0e68fc513bcf5d7
parent2c9615edd49e38eb4817364e3634c0b5f64e013d
parent2f50df68855a0af20d2a42fa0c80e42c90f58dd7
Merge tag 'backport/v3.14.24-ltsi-rc1/sh-sci-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip