From: Olof Johansson Date: Thu, 2 Jan 2014 19:58:30 +0000 (-0800) Subject: Merge tag 'u300-for-arm-soc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linus... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c01f97387ea4fa2fd57a22d38f22bcfe364b1b6f;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git Merge tag 'u300-for-arm-soc-1' of git://git./linux/kernel/git/linusw/linux-stericsson into next/fixes-non-critical From Linus Walleij: Misc U300 development for the v3.14 series: - Timekeeping patch from Uwe. - DT 0x0 cleanup from Lee. - Return value check from Wei. * tag 'u300-for-arm-soc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: ARM: u300: fix timekeeping when periodic mode is used ARM: u300: Remove '0x's from U300 DTS file ARM: u300: fix return value check in __u300_init_boardpower() Signed-off-by: Olof Johansson --- c01f97387ea4fa2fd57a22d38f22bcfe364b1b6f