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)
commitd28d3730fd377cf275a7ac00457ff5012841ee96
tree6513699ae22d55a3c953c0031a3a1644e29a0ce9
parent5e30c089e58dcf158b227909be848574f5a06fe9
parentd69043c42d8c6414fa28ad18d99973aa6c1c2e24
Merge tag 'for-linus-v3.7-rc7' of git://oss.sgi.com/xfs/xfs

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