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)

Trivial merge