opp4xxx_data: add 180/230 mhz
Add 180/230 builds

Conflicts:

	arch/arm/configs/tuna_defconfig
Added Vibrator Control version 1.

Conflicts:

	drivers/misc/Kconfig
	drivers/misc/Makefile
x86: Simplify code by removing a !SMP #ifdefs from 'struct cpuinfo_x86'

commit 141168c36cdee3ff23d9c7700b0edc47cb65479f and
commit 3f806e50981825fa56a7f1938f24c0680816be45 upstream.

Several fields in struct cpuinfo_x86 were not defined for the
!SMP case, likely to save space.  However, those fields still
have some meaning for UP, and keeping them allows some #ifdef
removal from other files.  The additional size of the UP kernel
from this change is not significant enough to worry about
keeping up the distinction:

	   text    data     bss     dec     hex filename
	4737168	 506459	 972040	6215667	 5ed7f3	vmlinux.o.before
	4737444	 506459	 972040	6215943	 5ed907	vmlinux.o.after

for a difference of 276 bytes for an example UP config.

If someone wants those 276 bytes back badly then it should
be implemented in a cleaner way.

Signed-off-by: Kevin Winchester <kjwinchester@gmail.com>
Cc: Steffen Persvold <sp@numascale.com>
Link: http://lkml.kernel.org/r/1324428742-12498-1-git-send-email-kjwinchester@gmail.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
prevent OTG host from switching to VBUS out
Revert "prevent OTG host from switching to VBUS out"

This reverts commit 5da1dc3f3afdd54e5a29aded5819975d34c97054.
ARM: backtrace: avoid crash on large invalid fp value

Wraparound on invalid frame pointer (signed) -4 <= fp <= -1
defeats check for too high.

Change-Id: Iaccb5d380e989660c06c0379a5e4ee31d9f84966
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Signed-off-by: Aleksandar Momiroski <alex.momir@ti.com>
net: wireless: bcmdhd: Reduce keep-alive period to 28 sec

Bug: 7386287

Change-Id: I115135e1d2cba0135c5201b95a2599dcabac0247
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

Conflicts:

	drivers/net/wireless/bcmdhd/dhd.h
defconfig
Added sysfs to force phone into user selectable pogo dock modes when
pogo GPIO detection fails. Useful for homemade pogo docks or
touchstone charging mods.

Enable/Disable:
(Default) Disable: echo 0 > /sys/kernel/dock_mode/force_dock_mode
Enable: echo 1 > /sys/kernel/dock_mode/force_dock_mode

Dock Mode:
(Default) Desk Dock: echo 0 > /sys/kernel/dock_mode/dock_mode
Car Dock: echo 1 > /sys/kernel/dock_mode/dock_mode

Charge Mode:
(Default) AC/FastCharge: echo 0 > /sys/kernel/dock_mode/charge_mode
USB: echo 1 > /sys/kernel/dock_mode/charge_mode
Update Makefile
prevent OTG host from switching to VBUS out
Revert "prevent OTG host from switching to VBUS out"

This reverts commit 5da1dc3f3afdd54e5a29aded5819975d34c97054.
defconfig: enable module support for exp
defconfig update
ASRAM: free up 50MB

credit goes to a bunch of people (definitely not me)