Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-android android-3.14-6AL.1.1
authorVishal Mahaveer <vishalm@ti.com>
Thu, 28 May 2015 00:02:55 +0000 (19:02 -0500)
committerVishal Mahaveer <vishalm@ti.com>
Thu, 28 May 2015 00:02:55 +0000 (19:02 -0500)
* p-ti-linux-3.14.y-common:
  ARM: dts: dra7xx-jamr3: Reserve memory for RingIO SR0

Change-Id: I9694d133ffea20376cf9388f45d803704470c2b5
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>

Trivial merge