diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 23:55:55 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 23:55:55 +0100 |
| commit | 49d41bae46f15da528ef9848fd7c9d38582aa8e9 (patch) | |
| tree | 76907a9a5066642a32cb238ef8d8367fc612d064 /fs/ubifs | |
| parent | Merge tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6 (diff) | |
| parent | dlm: add recovery callbacks (diff) | |
| download | linux-49d41bae46f15da528ef9848fd7c9d38582aa8e9.tar.xz linux-49d41bae46f15da528ef9848fd7c9d38582aa8e9.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
dlm: add recovery callbacks
dlm: add node slots and generation
dlm: move recovery barrier calls
dlm: convert rsb list to rb_tree
Diffstat (limited to 'fs/ubifs')
0 files changed, 0 insertions, 0 deletions