diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 11:23:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 11:23:42 -0700 |
| commit | f5d9d249b9a6884daff513ef08afa43d3f7e085f (patch) | |
| tree | 507fe2ad8827aa9011bdebcd98970e8563240d8e /fs/nilfs2 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic (diff) | |
| parent | pcmcia: fix ni_daq_700 compilation (diff) | |
| download | linux-dev-f5d9d249b9a6884daff513ef08afa43d3f7e085f.tar.xz linux-dev-f5d9d249b9a6884daff513ef08afa43d3f7e085f.zip | |
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
Diffstat (limited to 'fs/nilfs2')
0 files changed, 0 insertions, 0 deletions