summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/at91sam9260_devices.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-02 13:14:02 +0000
committerArnd Bergmann <arnd@arndb.de>2012-03-02 13:22:19 +0000
commit6e1d521b9d1201214ec4a67a7e4360232be5f963 (patch)
treec8d4c1084c922be301a435be19f59baaaffd6e0d /arch/arm/mach-at91/at91sam9260_devices.c
parent590d829a7cf882cf1a9d6fb7bdb247dc6b0993cb (diff)
parent280ad7fda5f95211857fda38960f2b6fdf6edd3e (diff)
parent7eca30aef7961e68ad74c0ef920546c2be7f6579 (diff)
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 <arnd@arndb.de>