Commits
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>
Showing diff to7eca30aef79
- Arnd Bergmann committed 590d829a7cfMMerge branch 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap in...
- Grant Likely committed 280ad7fda5fmfd: twl-core: Add IRQ_DOMAIN dependency TWL4030 depends on IRQ_DOMAIN support, so thi...
- Arnd Bergmann committed 7eca30aef79MMerge branch 'at91-3.4-base2+cleanup' of git://github.com/at91linux/linux-at91 into at9...