Merge tag 'for-linus-v3.6-rc7' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Sep 2012 19:43:01 +0000 (12:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Sep 2012 19:43:01 +0000 (12:43 -0700)
commit789f95b788146ec27ab068103aacd546d05db266
treeffb65a0be5e859be6fe93966a3f53999269ade78
parent36a21fe6399cafc440163890035ccd9b891de00f
parent0ba6e5368c302819da7aff537e0d7eff2616c6a6
Merge tag 'for-linus-v3.6-rc7' of git://oss.sgi.com/xfs/xfs

Pull xfs bugfixes from Ben Myers:
 - fix a regression related to xfs_sync_worker racing with unmount.
 - fix a race while discarding xfs buffers.

* tag 'for-linus-v3.6-rc7' of git://oss.sgi.com/xfs/xfs:
  xfs: stop the sync worker before xfs_unmountfs
  xfs: fix race while discarding buffers [V4]