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)
commit350549866fdb93676fee9f1193818fb4fca68d80
tree6fe2279d7f746e77b4969644307649e75ebd4b52
parent6569fc53877ec07caad58257d839a368d64b8af4
parent7061db73cd5597a4eb2312a99bfe824baf756de3
Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-android

* 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>