diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2012-03-02 13:14:02 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-02 13:22:19 +0000 |
| commit | 6e1d521b9d1201214ec4a67a7e4360232be5f963 (patch) | |
| tree | c8d4c1084c922be301a435be19f59baaaffd6e0d /arch/arm/mach-at91 | |
| parent | Merge branch 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt (diff) | |
| parent | mfd: twl-core: Add IRQ_DOMAIN dependency (diff) | |
| parent | Merge branch 'at91-3.4-base2+cleanup' of git://github.com/at91linux/linux-at91 into at91/staging/base2+cleanup (diff) | |
| download | linux-dev-6e1d521b9d1201214ec4a67a7e4360232be5f963.tar.xz linux-dev-6e1d521b9d1201214ec4a67a7e4360232be5f963.zip | |
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>