Merge tag 'omap-for-v3.14/fixes-dt-rc4' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Sun, 9 Mar 2014 06:56:31 +0000 (22:56 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 9 Mar 2014 06:56:31 +0000 (22:56 -0800)
commit10554647b488f58f2c36c78368e9bab4b93da721
tree007c561cd1390fc71fe23d0596849901cd9d5c47
parent4058f76247b29978352339fb6278bed796dd210f
parentae41a3030ce8901853b3cfd5e118a4b0288aa068
Merge tag 'omap-for-v3.14/fixes-dt-rc4' of git://git./linux/kernel/git/tmlind/linux-omap into fixes

From Tony Lindgren:

Two omap3430 vs 3630 device tree regression fixes for
issues booting 3430 based boards.

* tag 'omap-for-v3.14/fixes-dt-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: omap3-gta04: Add ti,omap36xx to compatible property to avoid problems with booting
  ARM: dts: omap3-igep: fix boot fail due wrong compatible match

Signed-off-by: Olof Johansson <olof@lixom.net>