Merge branch 'misc' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 May 2012 14:15:24 +0000 (15:15 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 May 2012 14:15:24 +0000 (15:15 +0100)
commit4175160b065e74572819a320dcd34129224a4e1c
tree3298e2c9a7c7db33bf28617875e5429e17eec61c
parentddf90a2ff2c4a9da99acc898a4afeab3e4251fcd
parent0ec8e7aa8f63f0cacd545fcd7f40f93fde2c0e6e
Merge branch 'misc' into for-linus

Conflicts:
arch/arm/kernel/ptrace.c
arch/arm/Kconfig
arch/arm/kernel/ptrace.c
arch/arm/kernel/signal.c
arch/arm/vfp/vfpmodule.c