diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-02 13:14:02 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-02 13:22:19 (GMT) |
| commit | 6e1d521b9d1201214ec4a67a7e4360232be5f963 (patch) | |
| tree | c8d4c1084c922be301a435be19f59baaaffd6e0d /arch/arm/plat-mxc | |
| parent | 590d829a7cf882cf1a9d6fb7bdb247dc6b0993cb (diff) | |
| parent | 280ad7fda5f95211857fda38960f2b6fdf6edd3e (diff) | |
| parent | 7eca30aef7961e68ad74c0ef920546c2be7f6579 (diff) | |
| download | linux-6e1d521b9d1201214ec4a67a7e4360232be5f963.tar.xz | |
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>