]> Git Repo - linux.git/commit
Merge nommu tree
authorRussell King <[email protected]>
Sat, 25 Mar 2006 22:08:55 +0000 (22:08 +0000)
committerRussell King <[email protected]>
Sat, 25 Mar 2006 22:08:55 +0000 (22:08 +0000)
commit0003cedfc577be9d679c16531f8720739e9637ed
tree3b7a1e9087384706c8320f85f650ab96139e8c00
parent3ee357f0f38a5fddebab18500c290d3879a2d89c
parentc76b6b41d0ae29e1127d9f81cb687cabda57c14c
Merge nommu tree

Fix merge conflict in arch/arm/mm/proc-xscale.S

Signed-off-by: Russell King <[email protected]>
arch/arm/kernel/head.S
arch/arm/mm/Kconfig
arch/arm/mm/proc-arm1020.S
arch/arm/mm/proc-arm1020e.S
arch/arm/mm/proc-arm720.S
arch/arm/mm/proc-arm920.S
arch/arm/mm/proc-arm922.S
arch/arm/mm/proc-arm925.S
arch/arm/mm/proc-arm926.S
arch/arm/mm/proc-xscale.S
This page took 0.061654 seconds and 4 git commands to generate.