Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 13 Apr 2011 22:32:13 +0000 (23:32 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 13 Apr 2011 22:32:13 +0000 (23:32 +0100)
commita84bd2ee81ea1bdbd238cd1c380ec25f50a876c5
treeba054d4b1a20dadec088fd4d8983fb5939227e46
parentaec995900fbc8cffa9f0f9e797ef07a0beb2b079
parent7db6a7fa09884b34d2a5d4e6e4ed58664a5f0cf8
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
arch/arm/Kconfig
arch/arm/mm/proc-arm920.S
arch/arm/mm/proc-v6.S
arch/arm/mm/proc-v7.S