Revert "Currently disable mako_hotplug as it doesnt compile"

This reverts commit d36e4beafa07b6f5d6a9e4605724a5abb3e6f055.
Revert "Sync with franco"

This reverts commit d60f9dd6bb3dd14d2e27f22b9060a9ca4ca37e65.
Revert "Gamma Control: fix small bug."

This reverts commit e230a55b1e1043cf56f894f9dcabed77a90ef198.
Revert "Gamma Control: separate whites, grays, mids and blacks by RED, GREEN and BLUE settings. Contrast, Brightness and Saturation are common to the RGB spectrum as it makes no sense to have separates for this options. TODO: add a function to reset all the gamma stats to default."

This reverts commit c5ca405112227ef8376aac6ffce413f2a59fba92.
Revert "Gamma Control: attempt to fix a kernel panic."

This reverts commit 8aab6e0fcb223e34df51b0a9f79f0b79feeb0ec9.
Revert "Gamma Control: improve the code when changing the gamma values. Also protect it with a mutex in hope to prevent bootloops when setting this values with an init.d. Remove limits on contrast, saturation and brightness."

This reverts commit 161ea5fbbbb9410b9b22978e9024c101abf7c992.
Revert "mako: display: prevent the kcal RGB values to be reset on screen off."

This reverts commit 12bc4f27f01eae2a9dd90d1e1184cde91719f43e.
Revert "Gamma Control V2: finish adding the #ifdef wrappers. Add sanity checks for contrast, saturation and brightness. Push version to 2."

This reverts commit d412778d200f08050d08fbfaa24e46f00db531eb.

Conflicts:
	drivers/misc/Makefile
Revert "Gamma Control: fix mix between whites and grays."

This reverts commit d18d12294ba905a587faa669e1eea78f8b7504f5.
Revert "Gamma Control: add Kconfig option for this interface. After changing the values the array is refreshed and gets rid of the necessity of screen off/on to apply the changes. Whites and Grays were mixed too, so thats fixed."

This reverts commit 731f79869c7b2525a4401f774e95d8a99c7e6b43.

Conflicts:
	drivers/misc/Kconfig
	drivers/misc/Makefile
Revert "Add Gamma Control v1. Thanks to @paranoidandroid for researching what each gamma value changed so that I could build this interface. It enables the possibility of tweaking whites, mids, blacks, contrast, saturation, brightness and greys. This is a full GPL'ed code and easy to use for any user without any special mumbo jumbo."

This reverts commit 3448b014cdd863bce8cbdb40aac5d1d90e520df0.

Conflicts:
	drivers/misc/Makefile
Revert "Revert "gamma control: WIP expose gamma parameters to sysfs interface""

This reverts commit d1841b0c28b2cee2973b1f42150f29e14e1ea8af.
Revert "Revert "gamma control: fix wip code derps :p""

This reverts commit 0fb10123c73dd8391498e79cc0707967f46a3a2e.
Revert "Revert "gamma control: add checksum to validate data integrity""

This reverts commit c3a8e0dfe38f37fc1d124acd8c3547ec3982ecf1.
Revert "Revert "gamma control: fix typo derp :(""

This reverts commit da003cee14d57b02ca73e2a8fd4f48cd894f5791.
cpuinit: get rid of __cpuinit, first regexp

This commit is the result of:

find -name "*.c" | xargs sed -i "s/ __cpuinit / /g"

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Dennis Rassmann <showp1984@gmail.com>

Conflicts:
	arch/arm/kernel/smp.c
	arch/arm/mach-msm/cpufreq.c
cpuinit: get rid of __cpuinit, second regexp

This commit is the result of:

find -name "*.c" | xargs sed -i "s/ __cpuexit / /g"

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
cpuinit: get rid of __cpuinit, third regexp

This commit is the result of:

find -name "*.c" | xargs sed -i "s/ __cpuinitdata//g"

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
cpuinit: get rid of __cpuinit, fourth regexp

This commit is the result of:

find -name "*.c" | xargs sed -i "s/ __cpuinit$//g"

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
cpuinit: get rid of __cpuinit, fifth regexp

This commit is the result of:

find arch/ -name "*.h" | xargs sed -i "s/ __cpuinit//g"

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Dennis Rassmann <showp1984@gmail.com>