max8997: move sysfs node for pwm level

Change-Id: I1ca8450000be99505c7c48c6c4fd2dfb15bba670
mshci: disable MMC_CAP_ERASE on u1

Change-Id: I944a80e4ffd9d7b86b18a13534a3fa8fd2104934
isa1200: move sysfs node for pwm level

Change-Id: I50b353531a1ee581217305b257d30317ce73b0c7
Merge git://github.com/CyanogenMod/android_kernel_samsung_smdk4412 into HEAD

Conflicts:
	drivers/mmc/host/mshci.c

Change-Id: Ieac8e8e8752968f3603558f7b93f0691021925fc
Merge branch 'linux-3.0.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into HEAD

Conflicts:
	crypto/algapi.c

Change-Id: Ia9862eba856d3bcf9a2580038617241428d0d98b
Fix miss merge

Change-Id: I619f48368b2aec08aa79c675002b9a5b6385c935
sc02c: disabled sec_debug temporary

Change-Id: I0b73cdfff46eb58ed648dff1d6523334f6e3ba67
Increase lowest GPU step for 1400MHz devices

Devices using the 1400MHz Exynos 4210 are using 1280*800 screens. This
is a much bigger resolution than the Galaxy S2. 100MHz as the lowest GPU
step is too low for these devices, resulting in lag. Bump it up to
134MHz.

Change-Id: Ifd08cdc2e263695232d034890e54585f122453ff
mali: pick the right GPU voltage table for 1400MHz devices, restore
thresholds

8-level table was always used, resulting in increased voltages for
1400MHz devices. Now, the right table (5-level) can be picked at
runtime.

Restore the thresholds to stock value for more stable frequencies.

Change-Id: I29900535c15557e75c72793b7169771982fce7f9
Merge "mali: pick the right GPU voltage table for 1400MHz devices, restore thresholds" into cm-10.1
Merge branch 'kbc4412' into cm-10.1

Conflicts:
	crypto/algapi.c
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1