diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-26 18:14:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-26 18:14:29 -0400 |
| commit | e4d50423d773fb8d5b714430ba5358e8a1b87c14 (patch) | |
| tree | fc6f6bd830cb8b2a1a94734c35b18d0f2ac7ea8c /drivers/pcmcia/rsrc_nonstatic.c | |
| parent | 6f063aea557f66eea8c35034a25df85cae5ced33 (diff) | |
| parent | d067633b4483f3c7d971d8f889f35340a8635bb5 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
nilfs2: fix imperfect completion wait in nilfs_wait_on_logs
nilfs2: fix hang-up of cleaner after log writer returned with error
nilfs2: fix duplicate call to nilfs_segctor_cancel_freev
Diffstat (limited to 'drivers/pcmcia/rsrc_nonstatic.c')
0 files changed, 0 insertions, 0 deletions