From: Tony Lindgren <tony@atomide.com>
Date: Wed, 9 May 2012 23:41:17 +0000 (-0700)
Subject: Merge tag 'omap-cleanup-timer-for-v3.5' into tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=722d82ac7b6bad8ed5af7a7b631143d8f87598f9;p=pandora-kernel.git

Merge tag 'omap-cleanup-timer-for-v3.5' into tmp-merge

Timer changes to make it easier to support various SoCs

Conflicts:
	arch/arm/mach-omap1/common.h
---

722d82ac7b6bad8ed5af7a7b631143d8f87598f9
Reading git-diff-tree failed