diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-13 12:05:49 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-13 12:05:49 +0100 |
| commit | 044e5f45e4ad890d03bd1e8bb44c634397cac24d (patch) | |
| tree | a6063f77bd719d933823915d2273eaadb6331611 /arch/arm/common/time-acorn.c | |
| parent | Merge branch 'imx' into devel (diff) | |
| parent | [ARM] pxa: add base support for PXA930 Handheld Platform (aka SAAR) (diff) | |
| download | linux-dev-044e5f45e4ad890d03bd1e8bb44c634397cac24d.tar.xz linux-dev-044e5f45e4ad890d03bd1e8bb44c634397cac24d.zip | |
Merge branch 'pxa' into devel
Conflicts:
arch/arm/configs/em_x270_defconfig
arch/arm/configs/xm_x270_defconfig
Diffstat (limited to 'arch/arm/common/time-acorn.c')
0 files changed, 0 insertions, 0 deletions