Merge
authorRussell King <rmk@flint.arm.linux.org.uk>
Mon, 25 Mar 2002 17:06:56 +0000 (17:06 +0000)
committerRussell King <rmk@flint.arm.linux.org.uk>
Mon, 25 Mar 2002 17:06:56 +0000 (17:06 +0000)
commit4dfff8c160e1cb2f64b50a86211204395d00a0dd
tree3afa5d278ecf37e7b5558e01498d68d44f61f418
parent8b8e1de69c1cb36b8e696c7a00d9d26b3374cbc5
parent47418c9eb3623149ea413bee5693473de1a1f435
Merge
arch/arm/kernel/armksyms.c
arch/arm/kernel/debug.S
arch/arm/kernel/entry-armv.S
arch/arm/mm/proc-xscale.S
drivers/video/sa1100fb.c