From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Aug 2014 17:03:10 +0000 (-0700)
Subject: Merge tag 'locks-v3.17-1' of git://git.samba.org/jlayton/linux
X-Git-Tag: v3.17-rc1~150
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=1bff598860f535e525c2a549f7f584ae7cc3fc1c;p=cascardo%2Flinux.git

Merge tag 'locks-v3.17-1' of git://git.samba.org/jlayton/linux

Pull file locking related changes from Jeff Layton:
 "Just a couple of changes from Christoph to start us down the road
  toward getting rid of the fl_owner_t typedef"

* tag 'locks-v3.17-1' of git://git.samba.org/jlayton/linux:
  locks: purge fl_owner_t from fs/locks.c
  locks: typedef fl_owner_t to void *
---

1bff598860f535e525c2a549f7f584ae7cc3fc1c