Revert "Update to 3.1.2"

This reverts commit cd3f4e238df9c5e8b2e0250cb470bed724579df5.

Conflicts:

	drivers/mfd/twl-core.c