From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 10 Mar 2012 02:09:18 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux... 
X-Git-Tag: accepted/tizen/common/20141203.182822~5154
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=86e06008338e5712603613a0f6770500f79e83bd;p=platform%2Fkernel%2Flinux-arm64.git

Merge branch 'for-linus' of git://git./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()
---

86e06008338e5712603613a0f6770500f79e83bd