Update pmem

Conflicts:
	drivers/misc/pmem.c