From: Kevin Hilman <khilman@linaro.org>
Date: Wed, 14 Aug 2013 15:14:50 +0000 (-0700)
Subject: Merge branch 'zynq/dt' into next/dt
X-Git-Tag: v3.12-rc1~116^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=080e3da4f4bf693ec59bd98eae3ee5bd5b1dd047;p=pandora-kernel.git

Merge branch 'zynq/dt' into next/dt

* zynq/dt: (1054 commits)
  arm: zynq: dt: Set correct L2 ram latencies
  + v3.11-rc5

Conflicts:
	arch/arm/Makefile
---

080e3da4f4bf693ec59bd98eae3ee5bd5b1dd047
Reading git-diff-tree failed