From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 27 Sep 2005 01:31:36 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
X-Git-Tag: v2.6.16.28-rc1~3618
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=bf0cbb3e4264e9d6493af757f63d4b0527d21eab;p=sfrench%2Fcifs-2.6.git

Merge /linux/kernel/git/brodo/pcmcia-fixes-2.6
---

bf0cbb3e4264e9d6493af757f63d4b0527d21eab