From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Jul 2008 17:55:07 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
X-Git-Tag: v2.6.27-rc1~1037
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=f39548a6ad1dbdfaab552419386ec5bb1d76fa0d;p=linux-2.6-omap-h63xx.git

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

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6:
  pcmcia: ide-cs: Remove outdated comment
  pcmcia: fix cisinfo_t removal
  pcmcia: fix return value in cm4000_cs.c
---

f39548a6ad1dbdfaab552419386ec5bb1d76fa0d