Hi Paul,
Today's linux-next merge of the sh tree got a conflict in
arch/sh/kernel/cpu/sh2a/clock-sh7201.c between commit
27f1acccd4d310e941d2e879445324595e2fe463 ("sh: Fix up SH7201 clkfwk
build") from the sh-current tree and commit
16b259203c513ed28bd31cc9a981e0d3ad517943 ("sh: migrate SH_CLK_MD to mode
pin API") from the sh tree.
The latter includes the fix from the former, so I used that.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpPcJgutAsL0.pgp
Description: PGP signature
