Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-android
authorPraneeth Bajjuri <praneeth@ti.com>
Thu, 14 Jan 2016 21:52:39 +0000 (15:52 -0600)
committerPraneeth Bajjuri <praneeth@ti.com>
Thu, 14 Jan 2016 21:52:39 +0000 (15:52 -0600)
commit2b18cd106e714a43dcf0e1d5f51f8eea714ed782
tree69c3b21f35fcfbd22a86f26c58b818994e14f010
parentdb3ae35afb194b347cf84e6be321b4bc65ebe94c
parent6a6796b49b1d858623ca8c96d3ab9e12cd1da4a4
Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-android

* p-ti-linux-3.14.y-common:
  ti_config_fragments/connectivity: Touchscreen: Enable EDT_FT5X06 built-in
  drivers: spi: ti-qspi: Fix dropped connection after NOR read
  ARM: dts: dra72: enable dss node

Conflicts:
arch/arm/boot/dts/dra72-evm.dts

Change-Id: I9d402523a3fb720a049ee1d929b7c2a1c387f271
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>