Revert "Update to 3.1.2"

This reverts commit d1406e7b9717f36fe0327e9ab5f6d85f102df1f7.

Conflicts:

	drivers/mfd/twl-core.c