diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-04 10:03:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-04 10:03:10 -0700 |
| commit | 1bff598860f535e525c2a549f7f584ae7cc3fc1c (patch) | |
| tree | e6c344e59b6434788a5111d86bf181397d2b6c16 /include/uapi/scsi/Kbuild | |
| parent | 3e7a716a92a0e051f5502c7b689f8c9127c37c33 (diff) | |
| parent | 73a8f5f7e6350766102fe8fb85048f7f8f0cb5f7 (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 *
Diffstat (limited to 'include/uapi/scsi/Kbuild')
0 files changed, 0 insertions, 0 deletions