Merge branches 'amba', 'fixes', 'misc', 'mmci', 'unstable/omap-dma' and 'unstable...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 3 Apr 2014 23:33:32 +0000 (00:33 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 3 Apr 2014 23:33:32 +0000 (00:33 +0100)
commit95959e6a06720834fc80a210e37898341c63cb91
tree832ed436b93bb7acd167d9ca8ecc4a45fc0aea22
parentf210c53a82ab9ba10574f8121a300d78e618febd
parent95c52fe063351192e0f4ffb70ef9bac1aa26f5a4
parente26a9e00afc482b971afcaef1db8c9034d4d6d7c
parentdfdf5f63b4380b9e719145c7cb2cb450a3d06ac4
parentaa4c5b962a7a03eb6b43b3d2677c3677022c1223
parent1ef2bf8227abe928e149772f9e6ee9d59c1bd97e
Merge branches 'amba', 'fixes', 'misc', 'mmci', 'unstable/omap-dma' and 'unstable/sa11x0' into for-next
arch/arm/include/asm/memory.h
arch/arm/kernel/head.S
arch/arm/kernel/setup.c
arch/arm/mach-sa1100/include/mach/collie.h
arch/arm/mm/mmu.c
arch/arm/mm/proc-v7.S