Update to 3.1.2

Conflicts:

	drivers/mfd/twl-core.c