From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Dec 2010 19:06:17 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: v3.0~2648
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=497b5b13c9e946651991e0296374a15d38590ce1;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: log timestamp changes to the source inode in rename
---

497b5b13c9e946651991e0296374a15d38590ce1