Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Mar 2006 22:17:59 +0000 (14:17 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Mar 2006 22:17:59 +0000 (14:17 -0800)

Trivial merge