From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Oct 2010 18:23:42 +0000 (-0700)
Subject: Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f5d9d249b9a6884daff513ef08afa43d3f7e085f;p=openwrt%2Fstaging%2Fblogic.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 ni_daq_700 compilation
  pcmcia: IOCARD is also required for using IRQs
---

f5d9d249b9a6884daff513ef08afa43d3f7e085f