]> git.openfabrics.org - ~shefty/rdma-dev.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)
commita0f0dd57f4a85310d9936f1770a0424b49fef876
tree2f85b8b67dda13d19b02ca39e0fbef921cb1cf8b
parent2a552d5e63d7fa602c9a9a0717008737f55625a6
parent846a136881b8f73c1f74250bf6acfaa309cab1f2
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