summaryrefslogtreecommitdiff
path: root/arch/arm/mach-msm/board-msm7x30.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-10-02 01:19:17 +0400
committerOlof Johansson <olof@lixom.net>2012-10-02 01:19:17 +0400
commit6d55d5968a8622f3ea20ec40737aea1cfba6438c (patch)
tree72481307c22f9b6170591cece793ea24f97a9ddb /arch/arm/mach-msm/board-msm7x30.c
parentf7b967bffefe69f1ad8b79e263237ec1feba7b9b (diff)
parentb6e3b5c2fea9c76617e101cbbc54ed14961f9dee (diff)
downloadlinux-6d55d5968a8622f3ea20ec40737aea1cfba6438c.tar.xz
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-msm/board-msm7x30.c')
0 files changed, 0 insertions, 0 deletions