From: Arnd Bergmann Date: Tue, 9 Apr 2013 13:57:27 +0000 (+0200) Subject: Merge branch 'mxs/cleanup' into next/multiplatform X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~67^2~11 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71f6424023cb9fa381efc7237ca05926b2b1ca9a;p=pandora-kernel.git Merge branch 'mxs/cleanup' into next/multiplatform This is a dependency for mxs/multiplatform Signed-off-by: Arnd Bergmann Conflicts: drivers/clocksource/Makefile --- 71f6424023cb9fa381efc7237ca05926b2b1ca9a Reading git-diff-tree failed