Merge by hand from Linus' tree.

Signed-off-by: Paul Mackerras <paulus@samba.org>