]> git.neil.brown.name Git - history.git/commitdiff
Merge flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-rmk-patchtest
authorRussell King <rmk@flint.arm.linux.org.uk>
Sun, 14 Apr 2002 18:59:35 +0000 (19:59 +0100)
committerRussell King <rmk@flint.arm.linux.org.uk>
Sun, 14 Apr 2002 18:59:35 +0000 (19:59 +0100)
into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-rmk

1  2 
arch/arm/kernel/armksyms.c

Simple merge