From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 28 Apr 2010 14:58:36 +0000 (-0700)
Subject: Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
X-Git-Tag: v2.6.34-rc6~14
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=3fb938b2a8bdbcf6086192d90fb7c73425e41fb9

Merge branch 'urgent' of git://git./linux/kernel/git/brodo/pcmcia-2.6

* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: fix matching rules for pseudo-multi-function cards
  pcmcia: pcmcia_dev_present bugfix
---

3fb938b2a8bdbcf6086192d90fb7c73425e41fb9