]> 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)
commitfe1fee999931f8ba1ba41079b237c9b87fa57428
treedf08f565b2c616b7e68fe35cd428a8c5ba3bfcb1
parent90b3155c63f52b349256fa2148bcc2da6abb713f
parentec4242509b61f11227031ad8f6242c8c3d64f7d3
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