From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Tue, 15 Jun 2004 11:55:48 +0000 (-0700)
Subject: Merge bk://bk.arm.linux.org.uk/linux-2.6-pcmcia
X-Git-Tag: v2.6.7~16
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=fc731434e3b64b69f36d5249402e93f932187c0b;p=history.git

Merge bk://bk.arm.linux.org.uk/linux-2.6-pcmcia
into ppc970.osdl.org:/home/torvalds/v2.6/linux
---

fc731434e3b64b69f36d5249402e93f932187c0b