tree 47b485ee950a4b66a6845510bc9676c293ad545d
parent ed2c12f323e8fafbc94f9bcfb924f9df36e64dc7
author Andrew Morton <akpm@linux-foundation.org> 1184835035 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1184864697 -0700

afs build fix

Bruce and David's patches clashed.

fs/afs/flock.c: In function 'afs_do_getlk':
fs/afs/flock.c:459: error: void value not ignored as it ought to be

Cc: "J. Bruce Fields" <bfields@fieldses.org>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>