0
0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-25 20:14:25 +08:00
linux/arch/c6x
Arnd Bergmann 6e1d521b9d 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>
2012-03-02 13:22:19 +00:00
..
boot Kbuild: Use dtc's -d (dependency) option 2012-02-14 21:14:44 -05:00
configs C6X: build infrastructure 2011-10-06 19:47:25 -04:00
include/asm irq_domain/c6x: Convert c6x to use generic irq_domain support. 2012-02-16 06:11:24 -07:00
kernel irq_domain/c6x: Use library of xlate functions 2012-02-16 06:11:24 -07:00
lib C6X: library code 2011-10-06 19:48:23 -04:00
mm C6X: memory management and DMA support 2011-10-06 19:47:37 -04:00
platforms irq_domain/c6x: Use library of xlate functions 2012-02-16 06:11:24 -07:00
Kconfig irq_domain/c6x: Convert c6x to use generic irq_domain support. 2012-02-16 06:11:24 -07:00
Makefile C6X: build infrastructure 2011-10-06 19:47:25 -04:00