summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-prima2
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-08-29 12:59:11 -0700
committerOlof Johansson <olof@lixom.net>2013-09-03 10:20:06 -0700
commit56e9e0f3a3c558b42db2dd5120d3a839e4beb282 (patch)
treef639ac890abbbf990aa7d3ddee0830eae8f8d7a0 /arch/arm/mach-prima2
parent103c6a71207f80e6ecfeba2c21d6246687bb0ee4 (diff)
parent620f5e1cbfc16aa1bd39c2c5386aee4d00850641 (diff)
downloadblackbird-op-linux-56e9e0f3a3c558b42db2dd5120d3a839e4beb282.tar.gz
blackbird-op-linux-56e9e0f3a3c558b42db2dd5120d3a839e4beb282.zip
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>
Diffstat (limited to 'arch/arm/mach-prima2')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud