| commit | ac1d426e825ab5778995f2f6f053ca2e6b45c622 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Mon May 17 17:24:04 2010 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Mon May 17 17:24:04 2010 +0100 |
| tree | 75b91356ca39463e0112931aa6790802fb1e07a2 | |
| parent | fda0e18c8a7a3e02747c2b045b4fcd2c920410b9 [diff] | |
| parent | a3685f00652af83f12b63e3b4ef48f29581ba48b [diff] |
Merge branch 'devel-stable' into devel Conflicts: arch/arm/Kconfig arch/arm/include/asm/system.h arch/arm/mm/Kconfig