]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'v6v7' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 16 Mar 2011 23:35:26 +0000 (23:35 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 16 Mar 2011 23:35:26 +0000 (23:35 +0000)
commit85194cb4a103d3d09d2b35f44dfb34f73d15740d
treefcfe103a499ca9e3d8fa0ecbca5b7d0d274da5ca
parentb1d7ea8f9bc9221370009367e37ea4750f484cdc
parent19073696b32f3b79709d71da52fb16f5a631979e
Merge branch 'v6v7' into devel

Conflicts:
arch/arm/include/asm/cacheflush.h
arch/arm/include/asm/proc-fns.h
arch/arm/mm/Kconfig
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/boot/compressed/head.S
arch/arm/include/asm/cacheflush.h
arch/arm/include/asm/glue-cache.h
arch/arm/include/asm/glue-proc.h
arch/arm/mm/Kconfig