From: Tony Lindgren <tony@atomide.com>
Date: Wed, 3 Apr 2013 17:32:47 +0000 (-0700)
Subject: Merge commit '7185684' into omap-for-v3.10/timer
X-Git-Tag: omap-for-v3.10/timer-signed~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43231b5be657fde1c4ced180d829bbd59ceef9ad;p=pandora-kernel.git

Merge commit '7185684' into omap-for-v3.10/timer

Conflicts:
	arch/arm/plat-omap/dmtimer.c

Resolve merge conflict in omap_device.c as per
Lothar Waßmann <LW@KARO-electronics.de>.
---

43231b5be657fde1c4ced180d829bbd59ceef9ad
Reading git-diff-tree failed