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)
commit7109561524dc57b95fd3f9b61547268b9b6db8ed
treedf08f565b2c616b7e68fe35cd428a8c5ba3bfcb1
parent6bf755db4d5e7ccea61fb17727a183b9bd8945b1
parent3bb70de692f70861f5c5729cd2b870d0104a7cc9
Merge branches 'fixes' and 'misc' into for-next

Conflicts:
arch/arm/kernel/iwmmxt.S
arch/arm/mm/cache-l2x0.c
arch/arm/mm/mmu.c
arch/arm/Kconfig
arch/arm/kernel/iwmmxt.S
arch/arm/mm/cache-l2x0.c