From: Tony Lindgren <tony@atomide.com>
Date: Wed, 3 Apr 2013 17:47:59 +0000 (-0700)
Subject: Merge branch 'omap-timer-for-v3.10' of git://github.com/jonhunter/linux into omap... 
X-Git-Tag: omap-for-v3.10/timer-signed^0
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f585bbfc54fec9dcf387fd2edb2d6f4908badf8;p=pandora-kernel.git

Merge branch 'omap-timer-for-v3.10' of git://github.com/jonhunter/linux into omap-for-v3.10/timer

Conflicts:
	arch/arm/mach-omap2/timer.c
---

7f585bbfc54fec9dcf387fd2edb2d6f4908badf8
Reading git-diff-tree failed