From: Olof Johansson <olof@lixom.net>
Date: Sun, 28 Apr 2013 22:15:05 +0000 (-0700)
Subject: Merge branch 'clksrc/cleanup' into next/multiplatform
X-Git-Tag: v3.12-rc1~930^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6604269dd262623ec79af3f349c8b93743f8014b;p=kernel%2Fkernel-generic.git

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
---

6604269dd262623ec79af3f349c8b93743f8014b