Some patches from 0.9.30.1 now applied upstream. The reminder have been only slightly modified to apply cleanly to the new base. Signed-off-by: Joachim Nilsson <jocke@vmlinux.org>