| commit | f5d9d249b9a6884daff513ef08afa43d3f7e085f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 22 11:23:42 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 22 11:23:42 2010 -0700 |
| tree | 507fe2ad8827aa9011bdebcd98970e8563240d8e | |
| parent | db08bf0877f3464fb0c2c37dcdd9f9683192ea26 [diff] | |
| parent | 36845d09b93ff04b1c26c47f2c278dd779462468 [diff] |
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