]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fixes' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 11 Oct 2012 09:55:04 +0000 (10:55 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 11 Oct 2012 09:55:04 +0000 (10:55 +0100)
commita8508460db618c8e47422a7b297c55686fb853c8
tree2f85b8b67dda13d19b02ca39e0fbef921cb1cf8b
parentec1856ce5c6b6049a7d33d57bba886f43c074a31
parentb43edd11056dd39e99b66d71739aa43450e20533
Merge branch 'fixes' into for-linus

Conflicts:
arch/arm/kernel/smp.c
arch/arm/include/asm/glue-cache.h
arch/arm/kernel/Makefile
arch/arm/kernel/head.S
arch/arm/kernel/setup.c
arch/arm/kernel/smp.c
arch/arm/mm/cache-v7.S