git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3e7a716 73a8f5f)
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)
commit1bff598860f535e525c2a549f7f584ae7cc3fc1c
treee6c344e59b6434788a5111d86bf181397d2b6c16tree | snapshot
parent3e7a716a92a0e051f5502c7b689f8c9127c37c33commit | diff
parent73a8f5f7e6350766102fe8fb85048f7f8f0cb5f7commit | 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 *
Pandora Kernel Repository