tree 507fe2ad8827aa9011bdebcd98970e8563240d8e
parent db08bf0877f3464fb0c2c37dcdd9f9683192ea26
parent 36845d09b93ff04b1c26c47f2c278dd779462468
author Linus Torvalds <torvalds@linux-foundation.org> 1287771822 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1287771822 -0700

Merge branch 'urgent' of git://git.kernel.org/pub/scm/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