Merge branch 'misc' into devel
commit1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 16 Mar 2011 23:35:25 +0000 (16 23:35 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 16 Mar 2011 23:35:25 +0000 (16 23:35 +0000)
treec685060f260410e6704c9dfd457ed8c347141f1d
parent2472f3c8d8fc18b25b2cf1574c036e238187c0ff
parent10a8c3839810ac9af1aec836d61b92e7a879f5fa
Merge branch 'misc' into devel

Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/boot/compressed/Makefile
arch/arm/include/asm/processor.h
arch/arm/kernel/head.S
arch/arm/kernel/module.c
arch/arm/kernel/ptrace.c
arch/arm/kernel/setup.c
arch/arm/kernel/signal.c
arch/arm/mm/Kconfig
arch/arm/mm/cache-l2x0.c