From: Jon Hunter <jon-hunter@ti.com>
Date: Mon, 1 Apr 2013 19:33:50 +0000 (-0500)
Subject: Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmp
X-Git-Tag: omap-for-v3.10/gpmc-signed~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dca3a783400a18e2bf4503b1d4a85c4d0ca1a7e4;p=pandora-kernel.git

Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmp

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

dca3a783400a18e2bf4503b1d4a85c4d0ca1a7e4
Reading git-diff-tree failed