diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-14 10:10:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-14 10:10:53 -0700 |
| commit | 9fc0178caa30070f65bded433f91756491a3cf26 (patch) | |
| tree | 0100c8f5a4b7a18450765f529e946d22164c5e49 /drivers/ide/ide-disk.c | |
| parent | 2b6b6d385d2933c105e27f2d25fdb36d392d7f59 (diff) | |
| parent | c85399c2da8b86de8f6877980294fa1a4a88a5a4 (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 possible mismatch of sufile counters on recovery
nilfs2: segment usage file cleanups
nilfs2: fix wrong accounting and duplicate brelse in nilfs_sufile_set_error
nilfs2: simplify handling of active state of segments fix
nilfs2: remove module version
nilfs2: fix lockdep recursive locking warning on meta data files
nilfs2: fix lockdep recursive locking warning on bmap
nilfs2: return f_fsid for statfs2
Diffstat (limited to 'drivers/ide/ide-disk.c')
0 files changed, 0 insertions, 0 deletions