diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 10:23:10 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 10:23:10 -0700 |
commit | 81faae7f9c245a17f585d6edb7d4683cc6336b11 (patch) | |
tree | 17f1f67095002d64a6b18bec4217cdb9ed8df512 /security | |
parent | Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 (diff) | |
parent | Merge branch 'move_extents' of git://oss.oracle.com/git/tye/linux-2.6 into ocfs2-merge-window (diff) | |
download | linux-dev-81faae7f9c245a17f585d6edb7d4683cc6336b11.tar.xz linux-dev-81faae7f9c245a17f585d6edb7d4683cc6336b11.zip |
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
Ocfs2/move_extents: Validate moving goal after the adjustment.
Ocfs2/move_extents: Avoid doing division in extent moving.
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions