From: Arnd Bergmann Date: Fri, 18 May 2012 13:04:12 +0000 (+0200) Subject: Merge branch 'at91/dt' into next/dt X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=396d81cd0fe12ce5d1f6d159f093f9315d2837bc;p=linux-beck.git Merge branch 'at91/dt' into next/dt This should help the merge with the at91 adc driver that is currently in the staging tree. * at91/dt: ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files Signed-off-by: Arnd Bergmann --- 396d81cd0fe12ce5d1f6d159f093f9315d2837bc