From: Olof Johansson Date: Thu, 2 Jan 2014 18:54:34 +0000 (-0800) Subject: Merge tag 'renesas-sh-soc-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: upstream/snapshot3+hdmi~3588^2~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=efcf3d38f128cfbfc7a62c3a5dc3fb42991c12e5;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge tag 'renesas-sh-soc-for-v3.14' of git://git./linux/kernel/git/horms/renesas into next/drivers Renesas SH based SoC Updates for v3.14 * Global - Don't set plat_sci_port scbrr_algo_id field - Declare SCIF register base and IRQ as resources * sh772[34] SoCs - Set serial port sampling rate to 8 for SCIFA ports (These are merged through arm-soc due to dependencies with the SCI platform data rework done for shmobile) * tag 'renesas-sh-soc-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: sh: Don't set plat_sci_port scbrr_algo_id field sh: sh772[34]: Set serial port sampling rate to 8 for SCIFA ports sh: Declare SCIF register base and IRQ as resources Signed-off-by: Olof Johansson --- efcf3d38f128cfbfc7a62c3a5dc3fb42991c12e5