From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 10 Nov 2005 17:48:34 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
X-Git-Tag: v2.6.15-rc1~50
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=759979ab17512a061c3a3e870f091af27ccdcbfb;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
---

759979ab17512a061c3a3e870f091af27ccdcbfb