summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-11-09 17:38:34 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-09 17:38:34 -0800
commit123a28d8b522b03dd97c1f791245924088616ac0 (patch)
treecda2f2b6ea4f4f31e0d23cb21b519ebf73cad82d /net
parent373ee21eecebc5c06786a803d99661a3657afcc7 (diff)
parent5726b27b09cc92452b543764899a07e7c8037edd (diff)
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
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions