tree 69d6fd6b3c25c14296918e9656c7b7532bdbc059
parent 5743695b0dd2c775b71d3d4541c243df3da964db
parent 6c06f072c2d797ddbb2270363de97c53ebbe0385
author Linus Torvalds <torvalds@linux-foundation.org> 1258479755 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1258479755 -0800

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)