drivers:video:omap2:dsscomp: fix some compiler warnings
Logger from 3.8

Conflicts:
	drivers/staging/android/logger.c
staging: android: logger: Allow a UID to read it's own log entries

Modify the kernel logger to record the UID associated with
the log entries. Always allow the same UID which generated a
log message to read the log message.

Allow anyone in the logs group, or anyone with CAP_SYSLOG, to
read all log entries.

In addition, allow the client to upgrade log formats, so they
can get additional information from the kernel.

Cc: Android Kernel Team <kernel-team@android.com>
Cc: Nick Kralevich <nnk@google.com>
Signed-off-by: Nick Kralevich <nnk@google.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: stratosk <stratosk@semaphore.gr>
smartreflex.c: Add MPU, IVA, MPU Min calibrated Voltage - Thanks Imoseyon
Revert "Added kernel config options 'OMAP_SMARTREFLEX_CUSTOM_SENSOR',"

This reverts commit 3f3787d4e8a5f1abd9cbbc3de827f3c03f8d7eb2.

Conflicts:
	arch/arm/mach-omap2/Kconfig
	arch/arm/mach-omap2/omap2plus-cpufreq.c
	arch/arm/mach-omap2/opp4xxx_data.c