Merge branch 'devel-stable' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 22 Jul 2011 22:09:07 +0000 (23:09 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 22 Jul 2011 22:09:07 +0000 (23:09 +0100)
commit3ad55155b222f2a901405dea20ff7c68828ecd92
tree53b24c981387b037084a333dc5ae23be8e82ef4a
parent06f365acef5ca54fd5708a0d853c4a89609536f1
parent6645cb61f3a1186a71475385d33f875dd8fb38bf
Merge branch 'devel-stable' into for-next

Conflicts:
arch/arm/kernel/entry-armv.S
13 files changed:
arch/arm/Kconfig
arch/arm/kernel/entry-armv.S
arch/arm/kernel/entry-header.S
arch/arm/kernel/perf_event.c
arch/arm/kernel/setup.c
arch/arm/mach-davinci/board-dm365-evm.c
arch/arm/mm/init.c
arch/arm/mm/proc-arm6_7.S
arch/arm/mm/proc-sa1100.S
arch/arm/mm/tlb-fa.S
arch/arm/mm/tlb-v6.S
arch/arm/mm/tlb-v7.S
arch/arm/vfp/vfpmodule.c