From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 9 May 2015 03:59:02 +0000 (-0700)
Subject: Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... 
X-Git-Tag: firefly_0821_release~176^2~1803
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=af6472881a6127ad075adf64e459d2905fbc8a5c;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus-4.1' of git://git./linux/kernel/git/mason/linux-btrfs

Pull btrfs fix from Chris Mason:
 "When an arm user reported crashes near page_address(page) in my new
  code, it became clear that I can't be trusted with GFP masks.  Filipe
  beat me to the patch, and I'll just be in the corner with my dunce cap
  on"

* 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: fix wrong mapping flags for free space inode
---

af6472881a6127ad075adf64e459d2905fbc8a5c