Merge kernel code.
Remove file committed by accident.
Merge changes to automountd, including indirect map support
and all kinds of general fixes.