Merge branch 'socfpga/dt' into next/dt
authorOlof Johansson <olof@lixom.net>
Thu, 29 Aug 2013 19:59:11 +0000 (12:59 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 3 Sep 2013 17:20:06 +0000 (10:20 -0700)
commit56e9e0f3a3c558b42db2dd5120d3a839e4beb282
treef639ac890abbbf990aa7d3ddee0830eae8f8d7a0
parent103c6a71207f80e6ecfeba2c21d6246687bb0ee4
parent620f5e1cbfc16aa1bd39c2c5386aee4d00850641
Merge branch 'socfpga/dt' into next/dt

SoCFPGA DT changes from Dinh Nguyen.

* socfpga/dt:
  dts: Rename DW APB timer compatible strings
  dts: Deprecate ALTR as a vendor prefix
  of: add vendor prefix for Altera Corp.

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