]> git.hungrycats.org Git - linux/commitdiff
Merge flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5
authorRussell King <rmk@flint.arm.linux.org.uk>
Tue, 1 Oct 2002 01:18:30 +0000 (02:18 +0100)
committerRussell King <rmk@flint.arm.linux.org.uk>
Tue, 1 Oct 2002 01:18:30 +0000 (02:18 +0100)
into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-rmk


Trivial merge