]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit1ddfb820a3fa16599452dc2db993bd1cb4641e9f
treedf08f565b2c616b7e68fe35cd428a8c5ba3bfcb1
parentf8b6f6c1425af86410b77465ff089d02d61571fc
parentbe1024bd69967ae492e9847e724e4beee41573e6
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