diff options
| author | Olof Johansson <olof@lixom.net> | 2014-01-02 11:58:30 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-01-02 11:58:30 -0800 |
| commit | c01f97387ea4fa2fd57a22d38f22bcfe364b1b6f (patch) | |
| tree | 061f8c30d69d454b2a2b4ec124222832bf37dc87 /arch/score | |
| parent | 55e0b071892c9112ab49496e924f7310843afb67 (diff) | |
| parent | 6a79799d5654bb7800614e8b7a009252be7ff90e (diff) | |
| download | talos-op-linux-c01f97387ea4fa2fd57a22d38f22bcfe364b1b6f.tar.gz talos-op-linux-c01f97387ea4fa2fd57a22d38f22bcfe364b1b6f.zip | |
Merge tag 'u300-for-arm-soc-1' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'arch/score')
0 files changed, 0 insertions, 0 deletions
