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

include/linux/clocksource.h

@@ -346,7 +346,7 @@ extern void clocksource_of_init(void);
 static inline void clocksource_of_init(void) {}
 #define CLOCKSOURCE_OF_DECLARE(name, compat, fn)			\
 	static const struct of_device_id __clksrc_of_table_##name	\
-		__unused __section(__clksrc_of_table)			\
+		__attribute__((unused))					\
 		 = { .compatible = compat,				\
 		     .data = (fn == (clocksource_of_init_fn)NULL) ? fn : fn }
 #endif