kernel: merge two mtdpart.c patches