diff options
| author | Joel Becker <jlbec@evilplan.org> | 2011-05-26 06:51:55 +0200 |
|---|---|---|
| committer | Joel Becker <jlbec@evilplan.org> | 2011-05-26 06:51:55 +0200 |
| commit | ece928df16494becd43f999aff9bd530182e7e81 (patch) | |
| tree | 905042764ea5d8ab6eda63666406e19f607bcf4c /arch/xtensa/include | |
| parent | Ocfs2: Teach local-mounted ocfs2 to handle unwritten_extents correctly. (diff) | |
| parent | Ocfs2/move_extents: Set several trivial constraints for threshold. (diff) | |
| download | linux-ece928df16494becd43f999aff9bd530182e7e81.tar.xz linux-ece928df16494becd43f999aff9bd530182e7e81.zip | |
Merge branch 'move_extents' of git://oss.oracle.com/git/tye/linux-2.6 into ocfs2-merge-window
Conflicts:
fs/ocfs2/ioctl.c
Diffstat (limited to 'arch/xtensa/include')
0 files changed, 0 insertions, 0 deletions