From: Arnd Bergmann Date: Fri, 2 Mar 2012 13:14:02 +0000 (+0000) Subject: Merge branches 'depends/irqdomain' and 'at91/base2+cleanup' into next/dt X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6e1d521b9d1201214ec4a67a7e4360232be5f963;p=linux-beck.git Merge branches 'depends/irqdomain' and 'at91/base2+cleanup' into next/dt These two branches are a dependency for the at91 device tree changes, so we pull them in here. at91/base2+cleanup will get merged through the arm-soc cleanup2 branch, while the irqdomain tree will be sent by Grant before this one gets integrated. Conflicts: drivers/rtc/rtc-at91sam9.c Signed-off-by: Arnd Bergmann --- 6e1d521b9d1201214ec4a67a7e4360232be5f963