From: Tony Lindgren <tony@atomide.com>
Date: Thu, 10 May 2012 18:17:53 +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=73f7e20b8d1ed8dddb2a48a7f15355d129354ad7;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
---

73f7e20b8d1ed8dddb2a48a7f15355d129354ad7
Reading git-diff-tree failed