Merge branches 'fixes' and 'misc' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 5 Aug 2014 09:27:13 +0000 (10:27 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 5 Aug 2014 09:27:13 +0000 (10:27 +0100)
Conflicts:
arch/arm/kernel/iwmmxt.S
arch/arm/mm/cache-l2x0.c
arch/arm/mm/mmu.c


Trivial merge