From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Nov 2015 01:38:34 +0000 (-0800)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~7152
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=123a28d8b522b03dd97c1f791245924088616ac0;p=mirror_ubuntu-artful-kernel.git

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

Pull ext2 fix from Jan Kara:
 "Fix for DAX on ext2"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  ext2: Add locking for DAX faults
---

123a28d8b522b03dd97c1f791245924088616ac0