From: Olof Johansson Date: Tue, 20 May 2014 05:06:02 +0000 (-0700) Subject: Merge tag 'sirf-soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua... X-Git-Tag: v3.16-rc1~30^2~45^2~9 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9e05f9f300828aecb84659cedc6399b7a76683ef;p=linux.git Merge tag 'sirf-soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux into next/cleanup Merge "ARM: sirf: machine update for 3.16" from Barry Song: Most of them fix some minor checkpatch issues according to key customers' requirement. And this patchset also cleanups the clk of clocksource: move to get clk by dts properity. * tag 'sirf-soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux: clocksource:sirf: remove the hardcode for the clk of timers irqchip: sirf: fix one minor checkpatch issue clocksource: prima2: fix some minor checkpatch issues ARM: prima2: rstc: fix some minor checkpatch issues + Linux 3.15-rc3 Signed-off-by: Olof Johansson --- 9e05f9f300828aecb84659cedc6399b7a76683ef