diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 14:19:17 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:19:17 -0700 |
| commit | 6d55d5968a8622f3ea20ec40737aea1cfba6438c (patch) | |
| tree | 72481307c22f9b6170591cece793ea24f97a9ddb /arch/arm/mach-imx/mach-imx6q.c | |
| 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
Diffstat (limited to 'arch/arm/mach-imx/mach-imx6q.c')
0 files changed, 0 insertions, 0 deletions