Revert "pyramid: Re-map memory to use 4 memory banks"

This reverts commit ec4407007fb35999d9748870309768b6294ef7a6.
Revert "mmc: Re-enable background operations"

This reverts commit a5d205283f39d8469d5583b3fc748ec03981a7a0.
Revert "Sultan_defconfig: Increase MSM_KGSL_PAGE_TABLE_COUNT to 48"

This reverts commit 11c85033bb5161d7a06c2697dcf822b57882e9d3.
Revert "mmc: Fix MMC_NO_BKOPS #ifdef"

This reverts commit aecc9714d66d30c2bf3ae830b7da991dcc14c0ec.
Revert "pm-data: Add missing PM mode from CAF"

This reverts commit 420382a2042d8319d50a13f52fa677e69bb5f998.
Revert "msm: pm-8x60: Use dma_alloc_coherent for the saved region"

This reverts commit 2675de4b7ff2edcd680f70a7a8c4d36003543396.
Revert "mach-msm: Import PM architecture from Flemmard"

This reverts commit f59c4d6ab60db658c683c9f07c1597ba5f52df6d.
Revert "pmic8901: Declare readb & writeb as extern"

This reverts commit 0adf4ab6d38705f1e4a817b078432004067172a0.

Dear lord, I really had no idea what I was doing...
Revert "devices-msm8x60: Remove 27MHz GPU freq"

This reverts commit 65c27805bce052fecc69c79d214605388289de24.
Revert "pyramid: Disable 2D GPU cores"

This reverts commit cc0ee0e48e9d1421f553bbfadf724952637802f9.
Revert "msm_otg_htc: "Port USB Fastcharge : originally ported by showp1984""

This reverts commit 0b3b57ebb1a136505ec611f980130a94624e33c7.
Revert "Add autosmp hotplug-algorithm by mrg666"

This reverts commit 360adb5e7aa7c34beda8cb2d4b377a854c4c4111.
Revert "devices-msm8x60: Add msm8660_pm_8x60 device from Flemmard"

This reverts commit b42970f81568e0e56b47480dbef654c9471924eb.

Conflicts:
	arch/arm/mach-msm/devices.h
Revert "msm: mdm2: Set mdm2ap_hsic_ready for powerup"

This reverts commit f93584bdfd4311a38aa53289f10f74be49b7b0aa.
Revert "msm: mdm2: Set ap2mdm_status low for reset"

This reverts commit 639a63f9161242a95d07529978bba25fbb6fe467.
Revert "msm: mdm2: Remove unused variable"

This reverts commit 12bac59eed094b70beb49930dc127fda0f9bb988.