From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 May 2010 21:11:09 +0000 (-0700)
Subject: Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
X-Git-Tag: firefly_0821_release~9833^2~2209
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2c32b1dab508ccaa4aea1a9d6047b65fc708e929;p=firefly-linux-kernel-4.4.55.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: fix compilation after 16bit state locking changes
  pcmcia: order userspace suspend and resume requests
  pcmcia: avoid pccard_validate_cis failure in resume callpath
---

2c32b1dab508ccaa4aea1a9d6047b65fc708e929