Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Nov 2015 01:38:34 +0000 (17:38 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Nov 2015 01:38:34 +0000 (17:38 -0800)
commit123a28d8b522b03dd97c1f791245924088616ac0
treecda2f2b6ea4f4f31e0d23cb21b519ebf73cad82d
parent373ee21eecebc5c06786a803d99661a3657afcc7
parent5726b27b09cc92452b543764899a07e7c8037edd
Merge branch 'for_linus' of git://git./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