Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 23:55:49 +0000 (15:55 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 23:55:49 +0000 (15:55 -0800)

Trivial merge