From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 Aug 2008 00:14:21 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
X-Git-Tag: v2.6.27-rc2~52
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c44df7413fd711bca818111b94cbd7ce5f3600a9;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: rsrc_nonstatic: check value, not pointer
---

c44df7413fd711bca818111b94cbd7ce5f3600a9