Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Oct 2010 18:23:42 +0000 (11:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Oct 2010 18:23:42 +0000 (11:23 -0700)
commitf5d9d249b9a6884daff513ef08afa43d3f7e085f
tree507fe2ad8827aa9011bdebcd98970e8563240d8e
parentdb08bf0877f3464fb0c2c37dcdd9f9683192ea26
parent36845d09b93ff04b1c26c47f2c278dd779462468
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