| commit | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Thu Oct 09 21:31:56 2008 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Oct 09 21:31:56 2008 +0100 |
| tree | a03891a32abe0da191fb765fe669a597e07423c6 | |
| parent | 90bb28b0644f7324f8bd1feb27b35146e6785ba2 [diff] | |
| parent | 8ec53663d2698076468b3e1edc4e1b418bd54de3 [diff] |
Merge branch 'ptebits' into devel Conflicts: arch/arm/Kconfig