| commit | b0df89868006517417251e02cc4ce5d4b0165885 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Mar 27 11:30:31 2012 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Mar 27 11:30:31 2012 +0100 |
| tree | 6800388c633a13f64fd1f7845ce026ca2606522f | |
| parent | 4ba21e868f4b6e2ce5432055e206edadc6319533 [diff] | |
| parent | 6c634726352f0d796a4b5e6aa9849ee5b45712ce [diff] |
Merge branch 'devel-stable' into for-linus Conflicts: arch/arm/Kconfig.debug arch/arm/plat-versatile/Kconfig Merge fixes: arch/arm/mach-integrator/Kconfig drivers/clocksource/Kconfig