diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-04 16:51:36 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-04 16:51:36 +0100 |
| commit | a2e28fc1164e56d37a56e3c53bd3e5a64462fd02 (patch) | |
| tree | 144dfddbd6d619db549bf43e43ddc116f29e9774 /fs/hppfs/hppfs.c | |
| parent | Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/air... (diff) | |
| parent | pcmcia: disable pcmcia ioctl for !ARM, prepare for removal (diff) | |
| download | linux-a2e28fc1164e56d37a56e3c53bd3e5a64462fd02.tar.xz linux-a2e28fc1164e56d37a56e3c53bd3e5a64462fd02.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
pcmcia: disable pcmcia ioctl for !ARM, prepare for removal
pcmcia: CodingStyle fixes
pcmcia: alchemy: fixup wrong comments
pcmcia: remove irq_list parameter from pd6729
yenta_socket: ENE CB712 CardBus bridge needs special treatment with Echo Audio Indigo soundcards
Diffstat (limited to 'fs/hppfs/hppfs.c')
0 files changed, 0 insertions, 0 deletions