Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Dec 2010 19:06:17 +0000 (11:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Dec 2010 19:06:17 +0000 (11:06 -0800)
commit497b5b13c9e946651991e0296374a15d38590ce1
treeca525ba5b5cfbb72169c1a5ee5874880acc212e3
parente97b71ded9ebe527681961c9e6f5ba99f6711974
parent05340d4ab2ec2b6b4962c1c41c6ea8fb550f947b
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