diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-04 00:59:32 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-04 00:59:32 +0200 |
commit | 3af91a1256b628d55913324d27fe747c69566749 (patch) | |
tree | cdbb84d4cce611ba722699d989bf1fecb73a69f1 /fs/nfs_common | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ros... (diff) | |
parent | UBIFS: fix-up free space earlier (diff) | |
download | linux-3af91a1256b628d55913324d27fe747c69566749.tar.xz linux-3af91a1256b628d55913324d27fe747c69566749.zip |
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
* 'linux-next' of git://git.infradead.org/ubifs-2.6:
UBIFS: fix-up free space earlier
UBIFS: intialize LPT earlier
UBIFS: assert no fixup when writing a node
UBIFS: fix clean znode counter corruption in error cases
UBIFS: fix memory leak on error path
UBIFS: fix shrinker object count reports
UBIFS: fix recovery broken by the previous recovery fix
UBIFS: amend ubifs_recover_leb interface
UBIFS: introduce a "grouped" journal head flag
UBIFS: supress false error messages
Diffstat (limited to 'fs/nfs_common')
0 files changed, 0 insertions, 0 deletions