Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 May 2011 17:23:10 +0000 (10:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 May 2011 17:23:10 +0000 (10:23 -0700)
commit81faae7f9c245a17f585d6edb7d4683cc6336b11
tree17f1f67095002d64a6b18bec4217cdb9ed8df512
parent95948c31bec26e631ecf138cb04dcd547519c7af
parentd194f1aa194d83ba3df0975497f9eaed48c95f6d
Merge branch 'linux-next' of git://git./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.