Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 14 Nov 2005 02:22:49 +0000 (18:22 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 14 Nov 2005 02:22:49 +0000 (18:22 -0800)
commitee90f62b3e69d0cd9f8edc6b95f07b1a8c38aaf4
tree9ceff60a5db6b98556e1eccd008ecddd470aace9
parent70ac551651a2c5a234b703d9a495817f2ca09639
parent807277cbf9a240b133ee378a53b65375088ef62a
Merge git://git./linux/kernel/git/brodo/pcmcia-fixes-2.6