| commit | 044e5f45e4ad890d03bd1e8bb44c634397cac24d | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Sun Jul 13 12:05:49 2008 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Sun Jul 13 12:05:49 2008 +0100 |
| tree | a6063f77bd719d933823915d2273eaadb6331611 | |
| parent | f0006314d37639714da9658cf4ff3f1f9f420764 [diff] | |
| parent | faf64ed4968e354624f330c6da6c1ce8b05a0713 [diff] |
Merge branch 'pxa' into devel Conflicts: arch/arm/configs/em_x270_defconfig arch/arm/configs/xm_x270_defconfig