diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 18:46:33 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 18:46:33 +0200 |
commit | b7c142dbf1e7422d0be7f7faa3f1163ad9da9788 (patch) | |
tree | 6e62c8654bb9c329f89246235062ac2a289960df /fs/mpage.c | |
parent | Documentation/vm/Makefile: don't try to build slqbinfo (diff) | |
parent | UBIFS: start using hrtimers (diff) | |
download | linux-b7c142dbf1e7422d0be7f7faa3f1163ad9da9788.tar.xz linux-b7c142dbf1e7422d0be7f7faa3f1163ad9da9788.zip |
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
* 'linux-next' of git://git.infradead.org/ubifs-2.6:
UBIFS: start using hrtimers
hrtimer: export ktime_add_safe
UBIFS: do not forget to register BDI device
UBIFS: allow sync option in rootflags
UBIFS: remove dead code
UBIFS: use anonymous device
UBIFS: return proper error code if the compr is not present
UBIFS: return error if link and unlink race
UBIFS: reset no_space flag after inode deletion
Diffstat (limited to 'fs/mpage.c')
0 files changed, 0 insertions, 0 deletions