Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 22:00:47 +0000 (14:00 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 22:00:47 +0000 (14:00 -0800)

Trivial merge