diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-27 22:36:59 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-27 22:36:59 -0800 |
| commit | 4b3c3be024cc4a9f0cfdc97a068e6dd46da12e74 (patch) | |
| tree | d202fe8ed90fce02b6a71cfed4cd8b2476f35e18 /arch/arm/mach-omap2/timer.c | |
| parent | b297d9cd1a23e98298d1f5fff18a7e4a5aa5d145 (diff) | |
| parent | 495b21dc0e488b784ab1d4007d00db1ca2a95c98 (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>
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
0 files changed, 0 insertions, 0 deletions