]> git.neil.brown.name Git - history.git/commitdiff
Merge bk://bk.arm.linux.org.uk
authorLinus Torvalds <torvalds@home.transmeta.com>
Sun, 17 Nov 2002 06:11:47 +0000 (22:11 -0800)
committerLinus Torvalds <torvalds@home.transmeta.com>
Sun, 17 Nov 2002 06:11:47 +0000 (22:11 -0800)
into home.transmeta.com:/home/torvalds/v2.5/linux

1  2 
arch/arm/mach-footbridge/isa-irq.c
drivers/acorn/net/ether3.c

Simple merge
Simple merge