Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[safe/jmp/linux-2.6] / Documentation / filesystems / locks.txt
2007-10-09 J. Bruce FieldsDocumentation: move locks.txt in filesystems/