Conflicts:
	arch/arm/boot/dts/at91sam9rl.dtsi

Needed as a dependency for the at91/dt2 branch
Signed-off-by: Arnd Bergmann <arnd@arndb.de>