From: Olof Johansson Date: Sun, 29 Dec 2013 21:22:19 +0000 (-0800) Subject: Merge tag 'renesas-sh-sci-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v3.14-rc1~114^2~3 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5aa88ce1137ca46164cc05dca3d7ee75ddee93d8;p=linux.git Merge tag 'renesas-sh-sci-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup From Simon Horman: Renesas SH SCI updates for v3.14 Updates for the SH SCI serial driver * Convert to clk_prepare/unprepare * Fix warnings due to improper casts and printk formats * tag 'renesas-sh-sci-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: serial: sh-sci: Convert to clk_prepare/unprepare serial: sh-sci: Don't enable/disable port from within break timer serial: sh-sci: Fix warnings due to improper casts and printk formats Signed-off-by: Olof Johansson --- 5aa88ce1137ca46164cc05dca3d7ee75ddee93d8