projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ea7113f 3d5a965)
Merge branch 'clksrc/cleanup' into next/multiplatform
authorOlof Johansson <olof@lixom.net>
Sun, 28 Apr 2013 22:15:05 +0000 (15:15 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 28 Apr 2013 22:15:05 +0000 (15:15 -0700)
commit6604269dd262623ec79af3f349c8b93743f8014b
tree6a825a26603242878a3065bbb10ffb3e4fc116c5tree | snapshot (tar.gz zip)
parentea7113f70d6f91dee0d7afd8580c8cac06b6d222commit | diff
parent3d5a96582303e28c48699f3faaf920ef7d43e6f2commit | diff
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