Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 10 Nov 2005 17:48:34 +0000 (09:48 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 10 Nov 2005 17:48:34 +0000 (09:48 -0800)
commit759979ab17512a061c3a3e870f091af27ccdcbfb
treea70792ce7f3fcf724b1be4e7e14edef8dc8ba77a
parent3ae0af12b458461f36dfddb26e54056be32928dd
parenta2932b35a0efd01b20a3f598d19db052d64935f5
Merge git://git./linux/kernel/git/brodo/pcmcia-fixes-2.6