commit 74efa045f4e2fdcc9d6384004c5b1bba0cc1fd3c
author Linus Torvalds <torvalds@linux-foundation.org> Wed Jun 04 08:12:50 2014 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Jun 04 08:12:50 2014 -0700
tree dd49456483356bb18200968bcefddc9ce78cae44
parent 1b3636093d4e07f5fc8a8eb2f9a5e14a5a2674bf
parent 62af4f1f7df44ea0bb1a11c94ac9fb384bf1c564

Merge tag 'locks-v3.16' of git://git.samba.org/jlayton/linux into next

Pull file locking changes from Jeff Layton:
 "Pretty quiet on the file-locking related front this cycle.  Just some
  small cleanups and the addition of some tracepoints in the lease
  handling code"

* tag 'locks-v3.16' of git://git.samba.org/jlayton/linux:
  locks: add some tracepoints in the lease handling code
  fs/locks.c: replace seq_printf by seq_puts
  locks: ensure that fl_owner is always initialized properly in flock and lease codepaths