Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Nov 2009 17:42:35 +0000 (09:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Nov 2009 17:42:35 +0000 (09:42 -0800)
commitac50e950784cae1c26ad9e09ebd8f8c706131eb3
tree69d6fd6b3c25c14296918e9656c7b7532bdbc059
parent5743695b0dd2c775b71d3d4541c243df3da964db
parent6c06f072c2d797ddbb2270363de97c53ebbe0385
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: copy li_lsn before dropping AIL lock
  XFS bug in log recover with quota (bugzilla id 855)