add rmk's patches

Conflicts:
	drivers/regulator/core.c
	drivers/regulator/fixed.c
	drivers/staging/Kconfig
	drivers/staging/Makefile