Merge
commit340fc58cdc937c07c8ed4723cc0ef0062a6cdcb3
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 19 Oct 2004 05:08:58 +0000 (18 22:08 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 19 Oct 2004 05:08:58 +0000 (18 22:08 -0700)
tree2a77c1ec017e0bd400320d392666045eaf9c2db2
parentda2def39ab0ab53286831929a4e2b691c6b63db0
parent0848d6f4c3afbe943a83863f16813b19cd4ded41
Merge
drivers/pcmcia/Kconfig
drivers/pcmcia/Makefile