Merge flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5
authorRussell King <rmk@flint.arm.linux.org.uk>
Thu, 4 Apr 2002 10:45:09 +0000 (11:45 +0100)
committerRussell King <rmk@flint.arm.linux.org.uk>
Thu, 4 Apr 2002 10:45:09 +0000 (11:45 +0100)
commit94394e5bc92026a2ff31cd03e11e015adfdb3260
tree8f24a3e60e98d45ba7416821aadb84508e18d79d
parent3f4d4f4e46865cb01d2e2717c6906e2ae079c042
parent5e4b50795ee8c7659a1181cea4c98712e02ea63e
Merge flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5
into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-rmk
arch/arm/kernel/armksyms.c
drivers/net/irda/sa1100_ir.c