From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Sep 2010 19:26:33 +0000 (-0700)
Subject: Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
X-Git-Tag: v3.0~3255
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9a457a524762edc1bb1ded65b7a75c01738632d5;p=platform%2Fkernel%2Flinux-amlogic.git

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: pd6729: Fix error path
  pcmcia: preserve configuration information if request_io fails partly
---

9a457a524762edc1bb1ded65b7a75c01738632d5