Merge branch 'dt/gic' into highbank/soc

Conflicts:
	arch/arm/Kconfig
This commit is contained in:
Arnd Bergmann
2011-10-31 14:11:34 +01:00
559 changed files with 8652 additions and 3078 deletions

View File

@@ -158,4 +158,10 @@ config DEBUG_S3C_UART
The uncompressor code port configuration is now handled
by CONFIG_S3C_LOWLEVEL_UART_PORT.
config ARM_KPROBES_TEST
tristate "Kprobes test module"
depends on KPROBES && MODULES
help
Perform tests of kprobes API and instruction set simulation.
endmenu