projects / platform / upstream / kernel-adaptation-pc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b297d9c 495b21d)
Merge branch 'armsoc/board' of git://github.com/hzhuang1/linux into next/boards
authorOlof Johansson <olof@lixom.net>
Mon, 28 Jan 2013 06:36:59 +0000 (22:36 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 28 Jan 2013 06:36:59 +0000 (22:36 -0800)
A couple of board updates for PXA, from Haojian Zhuang.

* 'armsoc/board' of git://github.com/hzhuang1/linux:
  ARM: pxa: pxa27x.c: add dummy SA1100 rtc clock
  ARM: palmtreo: replace #if defined with IF_ENABLED
  ARM: palmtreo: add docg4 device initialization

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge
Domain: System / Uncategorized;