Merge bk://bk.arm.linux.org.uk/linux-2.5-pcmcia

author Linus Torvalds <torvalds@home.osdl.org>

Tue, 19 Aug 2003 06:24:26 +0000 (23:24 -0700)

committer Linus Torvalds <torvalds@home.osdl.org>

Tue, 19 Aug 2003 06:24:26 +0000 (23:24 -0700)
author Linus Torvalds <torvalds@home.osdl.org>
Tue, 19 Aug 2003 06:24:26 +0000 (23:24 -0700)
committer Linus Torvalds <torvalds@home.osdl.org>
Tue, 19 Aug 2003 06:24:26 +0000 (23:24 -0700)
diff --cc drivers/pcmcia/i82365.c
Simple merge
diff --cc drivers/pcmcia/tcic.c
Simple merge
author	Linus Torvalds <torvalds@home.osdl.org>
	Tue, 19 Aug 2003 06:24:26 +0000 (23:24 -0700)
committer	Linus Torvalds <torvalds@home.osdl.org>
	Tue, 19 Aug 2003 06:24:26 +0000 (23:24 -0700)
		1	2
drivers/pcmcia/i82365.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pcmcia/tcic.c	patch \|	diff1 \|	diff2 \|	blob \| history