Revert "Glacier: move panel orientation calls to unblank"

This reverts commit 318be98f6bcfe7ba8f30005e1f9de2789f4856fe.
Glacier: fixup panel init code

Change-Id: I919e379b8006643a11943a82a1ad80a48e93d3c0
update defconfig
Merge "Revert "Glacier: move panel orientation calls to unblank"" into jellybean
Merge "Glacier: fixup panel init code" into jellybean
OOM: fix potential killing of thread that is disabled (rohanmathur)
optimize apply_slack (Thicklizard)
VFP: Updated VFP to max from 3.4.Y Google Android (thicklizard)
Sched: Fix rq->cpu_load[] calculations (thicklizard)
Merge remote-tracking branch 'upstream/jellybean' into jellybean
cpufreq: interactive: handle errors from cpufreq_frequency_table_target

Add checks for error return from cpufreq_frequency_table_target, and be
less noisy on the existing call with an error check.  CPU hotplug and
system shutdown may cause this call to return -EINVAL.

Bug: 8613560
Change-Id: Id78d8829920462c0db1c7e14e717d91740d6cb44
Signed-off-by: Todd Poynor <toddpoynor@google.com>
cpufreq: interactive: reduce chance of zero time delta on load eval

Reschedule load sampling timer after timestamp of sample start taken,
hold spinlock across entire sequence to avoid preemption.  Avoid the
WARN for zero time delta in the load sampling timer function.

Change-Id: Idc10a756f09141decb6df92669521a1ebf0dbc10
Signed-off-by: Todd Poynor <toddpoynor@google.com>
cpufreq: interactive: avoid underflow on active time calculation

Check for idle time delta less than elapsed time delta, avoid
underflow computing active time.

Change-Id: I3e4c6ef1ad794eec49ed379c0c50fa727fd6ad28
Signed-off-by: Minsung Kim <ms925.kim@samsung.com>
	Revert previous merge
Merge branch 'lce-jb' into mergemergemerge

Conflicts:
	arch/arm/Kconfig
	arch/arm/boot/compressed/Makefile
	arch/arm/mach-msm/clock-7x30.c
	arch/arm/mach-msm/devices-msm7x30.c
	drivers/cpufreq/Kconfig
	drivers/cpufreq/Makefile
	drivers/cpufreq/cpufreq_asswax.c
	drivers/cpufreq/cpufreq_lulzactive.c
	drivers/cpufreq/cpufreq_smartass2.c
	drivers/misc/cable_detect_8x55.c
	drivers/usb/otg/msm_otg.c
USB: option: blacklist network interface on Huawei E1820

commit b8a24e6281d37243c06b9497dcbfaa98c1e2ad35 upstream.

The mode used by Windows for the Huawei E1820 will use the
same ff/ff/ff class codes for both serial and network
functions.

Reported-by: Graham Inggs <graham.inggs@uct.ac.za>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
includes: linux: cpufreq.h: 	Fix lots of overlooked defaults

drivers: cpufreqs: Kconfig:	Revert changes from merge
ALSA: usb-audio - Apply Logitech QuickCam Pro 9000 quirk only to audio iface

commit 8eafc0a161123d90617c9ca2eddfe87b382b1b89 upstream.

... instead of applying to all interfaces.

Reference: http://forums.gentoo.org/viewtopic-p-6886404.html

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
USB: iuu_phoenix: fix bulk-message timeout

commit 6c13ff68a7ce01da7a51b44241a7aad8eaaedde7 upstream.

The bulk-message timeout is specified in milliseconds and should not
depend on HZ.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
USB: keyspan: fix bogus array index

commit a07088098a650267b2eda689538133a324b9523f upstream.

The outcont_endpoints array was indexed using the port minor number
(which can be greater than the array size) rather than the device port
number.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>