Merge tag 'for-linus-v3.7-rc7' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 18 Nov 2012 18:29:34 +0000 (08:29 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 18 Nov 2012 18:29:34 +0000 (08:29 -1000)
Pull xfs bugfixes from Ben Myers:

 - fix attr tree double split corruption

 - fix broken error handling in xfs_vm_writepage

 - drop buffer io reference when a bad bio is built

* tag 'for-linus-v3.7-rc7' of git://oss.sgi.com/xfs/xfs:
  xfs: drop buffer io reference when a bad bio is built
  xfs: fix broken error handling in xfs_vm_writepage
  xfs: fix attr tree double split corruption


Trivial merge