| commit | 6d55d5968a8622f3ea20ec40737aea1cfba6438c | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Mon Oct 01 14:19:17 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Mon Oct 01 14:19:17 2012 -0700 |
| tree | 72481307c22f9b6170591cece793ea24f97a9ddb | |
| parent | f7b967bffefe69f1ad8b79e263237ec1feba7b9b [diff] | |
| parent | b6e3b5c2fea9c76617e101cbbc54ed14961f9dee [diff] |
Merge branch 'next/soc' into HEAD Conflicts: arch/arm/mach-ux500/clock.c arch/arm/mach-ux500/cpu.c drivers/clocksource/Makefile