aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-07-16 16:28:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-07-16 16:28:28 -0700
commitf76d94def5605fbec1de61218e91fe1002fd322f (patch)
tree8181de42c62a8a30453bc6c70326a4ff278af726 /include/linux
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security (diff)
parentjfs: clean up jfs_rename and fix out of order unlock (diff)
downloadlinux-dev-f76d94def5605fbec1de61218e91fe1002fd322f.tar.xz
linux-dev-f76d94def5605fbec1de61218e91fe1002fd322f.zip
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/linux')
0 files changed, 0 insertions, 0 deletions