summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-07-17 02:28:28 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-07-17 02:28:28 +0300
commitf76d94def5605fbec1de61218e91fe1002fd322f (patch)
tree8181de42c62a8a30453bc6c70326a4ff278af726 /include
parent3aa20508a6fe386c2a893027ef4c4ef78ee4eac2 (diff)
parent26456955719b79cc4a011b18221aa68f599f6b6c (diff)
downloadlinux-f76d94def5605fbec1de61218e91fe1002fd322f.tar.xz
Merge tag 'jfs-4.2' of git://github.com/kleikamp/linux-shaggy
Pull jfs fixes from David Kleikamp: "A couple trivial fixes and an error path fix" * tag 'jfs-4.2' of git://github.com/kleikamp/linux-shaggy: jfs: clean up jfs_rename and fix out of order unlock jfs: fix indentation on if statement jfs: removed a prohibited space after opening parenthesis
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions