From: Tony Lindgren Date: Mon, 26 Nov 2012 21:51:02 +0000 (-0800) Subject: Merge tag 'omap-for-v3.8/cleanup-timer-signed' into omap-for-v3.8/tmp-merge X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46ee3aa3fc16bcca0d8c009dccaf589e9a715220;p=pandora-kernel.git Merge tag 'omap-for-v3.8/cleanup-timer-signed' into omap-for-v3.8/tmp-merge Timer clean-up to get us closer to moving timer code to drivers, and to get rid of CONFIG_OMAP_32K_TIMER and rely on the board or devicetree provided timer configuration. Note that these changes are on top of the recent timer fixes. Conflicts: arch/arm/mach-omap2/board-cm-t3517.c --- 46ee3aa3fc16bcca0d8c009dccaf589e9a715220 Reading git-diff-tree failed