aboutsummaryrefslogtreecommitdiff
path: root/fs/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-07 09:56:22 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-07 09:56:22 -0800
commitff4d7fa8c32f6ec513fb792c060809ec82d53ea4 (patch)
tree2b04ad419ff934fd640a97ac8e9df1abdd1e503c /fs/Makefile
parente0d65113a70f1dc514e625cc4e7a7485a4bf72df (diff)
parenta88b470773bc5b640292d8be7b8e7e1011a86639 (diff)
Merge git://git.samba.org/sfrench/cifs-2.6
* git://git.samba.org/sfrench/cifs-2.6: CIFS: Cleanup byte-range locking code style CIFS: Simplify setlk error handling for mandatory locking
Diffstat (limited to 'fs/Makefile')
0 files changed, 0 insertions, 0 deletions