From: Olof Johansson <olof@lixom.net>
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-Tag: firefly_0821_release~176^2~4591^2~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c01f97387ea4fa2fd57a22d38f22bcfe364b1b6f;p=firefly-linux-kernel-4.4.55.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 <olof@lixom.net>
---

c01f97387ea4fa2fd57a22d38f22bcfe364b1b6f