diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-14 10:01:44 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-14 10:01:44 (GMT) |
| commit | b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc (patch) | |
| tree | c65b81ef9ae5076d2137034accfa2610f45a13de /arch/arm/mach-mx1 | |
| parent | 06099961002a813324d057a91695af7c72939da6 (diff) | |
| parent | 7666c17e2b0986a079da46122d8658544416c2cf (diff) | |
| download | linux-b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc.tar.xz | |
Merge branch 'u300' into devel
Conflicts:
arch/arm/Makefile
Updates:
arch/arm/mach-u300/core.c
arch/arm/mach-u300/timer.c
Diffstat (limited to 'arch/arm/mach-mx1')
0 files changed, 0 insertions, 0 deletions