From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 1 Mar 2006 22:17:59 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
X-Git-Tag: v2.6.16-rc6~136
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe05f54181db868c5720cc4dc0741227b9ba5a60;p=linux-2.6

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

fe05f54181db868c5720cc4dc0741227b9ba5a60