| commit | f0006314d37639714da9658cf4ff3f1f9f420764 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Thu Jul 10 16:41:50 2008 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Jul 10 16:41:50 2008 +0100 |
| tree | b8a18e014a40f2f8fd5148aab09c869dfaabd7a9 | |
| parent | a177ba3b7a08beef3f0fe74efa0f90701891945a [diff] | |
| parent | 1bd55a436f1f90de0e7f476e514e01bd67497b88 [diff] |
Merge branch 'imx' into devel Conflicts: arch/arm/mm/Kconfig