From: Linus Torvalds Date: Fri, 27 May 2011 17:23:10 +0000 (-0700) Subject: Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec... X-Git-Tag: MMI-PSA29.97-13-9~19358 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=81faae7f9c245a17f585d6edb7d4683cc6336b11;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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. --- 81faae7f9c245a17f585d6edb7d4683cc6336b11