| commit | 31bccbf39208133415000520c79ebe7b291786df | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Thu Nov 27 12:39:43 2008 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Nov 27 12:39:43 2008 +0000 |
| tree | e03b799594ec22613ca2eb7382fc0a98e0cd4b0f | |
| parent | e902be56cbf2a48d96d11d6884767e638d41c712 [diff] | |
| parent | 635f0258e5ae526034486b4ae9020e64bfb7d27e [diff] |
Merge branch 'clps7500' into devel Conflicts: arch/arm/Kconfig