projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3aa2050 2645695)
Merge tag 'jfs-4.2' of git://github.com/kleikamp/linux-shaggy
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jul 2015 23:28:28 +0000 (16:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jul 2015 23:28:28 +0000 (16:28 -0700)
commitf76d94def5605fbec1de61218e91fe1002fd322f
tree8181de42c62a8a30453bc6c70326a4ff278af726tree | snapshot
parent3aa20508a6fe386c2a893027ef4c4ef78ee4eac2commit | diff
parent26456955719b79cc4a011b18221aa68f599f6b6ccommit | diff
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
fs/jfs/inode.c diff1 | diff2 | blob | history
fs/jfs/namei.c diff1 | diff2 | blob | history
John Crispins staging tree