]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit4b3c3be024cc4a9f0cfdc97a068e6dd46da12e74
treed202fe8ed90fce02b6a71cfed4cd8b2476f35e18tree | snapshot
parentb297d9cd1a23e98298d1f5fff18a7e4a5aa5d145commit | diff
parent495b21dc0e488b784ab1d4007d00db1ca2a95c98commit | diff
Merge branch 'armsoc/board' of git://github.com/hzhuang1/linux into next/boards

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>
Linux kernel for KaRo TX COM modules