| commit | b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Sun Jun 14 11:01:44 2009 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Sun Jun 14 11:01:44 2009 +0100 |
| tree | c65b81ef9ae5076d2137034accfa2610f45a13de | |
| parent | 06099961002a813324d057a91695af7c72939da6 [diff] | |
| parent | 7666c17e2b0986a079da46122d8658544416c2cf [diff] |
Merge branch 'u300' into devel Conflicts: arch/arm/Makefile Updates: arch/arm/mach-u300/core.c arch/arm/mach-u300/timer.c