From: Olof Johansson Date: Thu, 29 Aug 2013 19:59:11 +0000 (-0700) Subject: Merge branch 'socfpga/dt' into next/dt X-Git-Tag: firefly_0821_release~176^2~5404^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=56e9e0f3a3c558b42db2dd5120d3a839e4beb282;p=firefly-linux-kernel-4.4.55.git 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 --- 56e9e0f3a3c558b42db2dd5120d3a839e4beb282