From: Olof Johansson Date: Tue, 29 Oct 2013 19:41:43 +0000 (-0700) Subject: Merge branch 'sirf/dt' into next/dt X-Git-Tag: v3.13-rc1~156^2~5 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b01928a41f73f4c020892ff36c7d2a47cd9f8704;p=linux.git Merge branch 'sirf/dt' into next/dt From Barry Song: Some missed dt nodes for sirf dts for 3.13. Among them: - add missed chhifbg node in prima2 and atlas6 dts - add missed cell, cs and dma channel for SPI nodes - add missed graphics2d iobg in atlas6 dts - add missed address-cells and size-cells for prima2 I2C - add missed memcontrol-monitor node in prima2 and atlas6 dts * sirf/dt: ARM: dts: sirf: add missed address-cells and size-cells for prima2 I2C ARM: dts: sirf: add missed cell, cs and dma channel for SPI nodes ARM: dts: sirf: add missed graphics2d iobg in atlas6 dts ARM: dts: sirf: add missed chhifbg node in prima2 and atlas6 dts ARM: dts: sirf: add missed memcontrol-monitor node in prima2 and atlas6 dts Signed-off-by: Olof Johansson --- b01928a41f73f4c020892ff36c7d2a47cd9f8704