]> 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)
commita5e8cfdb7753e5c7cb1e3d1c6c25d81a075d260e
tree2f85b8b67dda13d19b02ca39e0fbef921cb1cf8b
parentf7b74a3e4cbe4ad40af6f51d5b1e8d39fc5e442d
parentb3c34c10165e6b7dc1d7c6e680749d446c2fea75
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