]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commited485cf122ef161e2a1b17643b2add09efa5d888
tree53b24c981387b037084a333dc5ae23be8e82ef4a
parent53f85a8c769e82d56db6837073fd6f446490a319
parent7b8a5b68b34e65ad0a69faa5ba0751c76cb6841b
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