]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e55c4e9 58d439a)
Merge tag 'locks-v3.17-1' of git://git.samba.org/jlayton/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Aug 2014 17:03:10 +0000 (10:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Aug 2014 17:03:10 +0000 (10:03 -0700)
commit8492eee20cad3a95ac9f8c6c844bb62534537ecd
treee6c344e59b6434788a5111d86bf181397d2b6c16tree | snapshot
parente55c4e93d70e710db420e5724bf3aa58997b2616commit | diff
parent58d439a1ec5b2bc4c91cc30da46bbbd4e5d4ad75commit | diff
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 *
Linux Kernel Source Tree.