diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-04 08:26:08 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-04 08:26:08 -0800 |
commit | 64ba9926759792cf7b95f823402e2781edd1b5d4 (patch) | |
tree | 8a33eeaac8d00f41eaea40492e639b42791651a7 /kernel/posix-timers.c | |
parent | 6895210e89df20520916c94a4dc148a43229053e (diff) | |
parent | 50a76fd3c352ed2740eba01512efcfceee0703be (diff) |
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
* 'for-linus' of git://git.open-osd.org/linux-open-osd:
exofs: groups support
exofs: Prepare for groups
exofs: Error recovery if object is missing from storage
exofs: convert io_state to use pages array instead of bio at input
exofs: RAID0 support
exofs: Define on-disk per-inode optional layout attribute
exofs: unindent exofs_sbi_read
exofs: Move layout related members to a layout structure
exofs: Recover in the case of read-passed-end-of-file
exofs: Micro-optimize exofs_i_info
exofs: debug print even less
Diffstat (limited to 'kernel/posix-timers.c')
0 files changed, 0 insertions, 0 deletions