Hi Geert,

On Wed, 14 May 2014 12:26:38 +0200 Geert Uytterhoeven [off-list ref] wrote:

On Tue, May 13, 2014 at 2:05 AM, Mike Turquette [off-list ref] wrote:

quoted

Quoting Wolfram Sang (2014-04-29 03:03:32)

quoted

From: Wolfram Sang <wsa+renesas@sang-engineering.com>

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Acked-by: Mike Turquette <redacted>

No need to take this through the clk tree. Feel free to send it with the
rest through arm-soc.

(merging in clk/clk-next)

Note that this will cause a conflict for you, as Mike applied commit
5483bf698f42a6f0467463b064084eb888298232 ("clk: shmobile: r8a7779:
Add MSTP clock support"), which adds a line at the exact same spot.

Resolution: both lines should be kept.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140514/8a7768c7/attachment.sig>