| commit | 7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Sat Jul 12 21:43:01 2008 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Sat Jul 12 21:43:01 2008 +0100 |
| tree | 110d24e6394dbd98cb33d80a5587cd18c8315e0b | |
| parent | a9da4f7ed6a702996ac9d1bbaf1a3969a4c092b3 [diff] | |
| parent | 938870491f0cad030b358af47e28d124b72702d1 [diff] |
Merge branch 'pxa-tosa' into pxa Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/tosa.c arch/arm/mach-pxa/spitz.c