tree 53d8e522e7d876b52c09bcbefac80836b3ceaa5c
parent be22aece684f5a700e6247b9861c3759d5798a3c
parent a175423c831ea582c06784d1e172d2ce1d79923a
author Linus Torvalds <torvalds@linux-foundation.org> 1331345358 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1331345358 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

Pull btrfs updates from Chris Mason:
 "I have two additional and btrfs fixes in my for-linus branch.  One is
  a casting error that leads to memory corruption on i386 during scrub,
  and the other fixes a corner case in the backref walking code (also
  triggered by scrub)."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: fix casting error in scrub reada code
  btrfs: fix locking issues in find_parent_nodes()