aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-spear/platsmp.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-04-28 15:15:05 -0700
committerOlof Johansson <olof@lixom.net>2013-04-28 15:15:05 -0700
commit6604269dd262623ec79af3f349c8b93743f8014b (patch)
tree6a825a26603242878a3065bbb10ffb3e4fc116c5 /arch/arm/mach-spear/platsmp.c
parentea7113f70d6f91dee0d7afd8580c8cac06b6d222 (diff)
parent3d5a96582303e28c48699f3faaf920ef7d43e6f2 (diff)
downloadlinux-stericsson-6604269dd262623ec79af3f349c8b93743f8014b.tar.gz
Merge branch 'clksrc/cleanup' into next/multiplatform
Merge in the clksrc/cleanup branch to avoid a silly merge conflict. For some reason two versions of the same patch were merged in two branches. Resolve this here to avoid merge conflicts down the road, since it can be confusing to tell which version is the one to keep. * clksrc/cleanup: clocksource: make CLOCKSOURCE_OF_DECLARE type safe Signed-off-by: Olof Johansson <olof@lixom.net> Conflicts: include/linux/clocksource.h
Diffstat (limited to 'arch/arm/mach-spear/platsmp.c')
0 files changed, 0 insertions, 0 deletions