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)
commit58cba4650a7a414eabd2b40cc9d8e45fcdf192d9
tree9aedb8e87eba92dc203aa169d4f7459a21be9e34
parent37ef4399a6bb265d3035e6d6e45f7677b132a3ba
parentdb1019ca0548b263989bc98900eaf15107e533ad
Merge git://git./linux/kernel/git/brodo/pcmcia-fixes-2.6