bcmdhd: finished porting entropy's patch
net: wireless: bcmdhd: Fix p2p "linear" IE parsing

Change-Id: Id9e358897529940eaaa6654f67297e1b77f52d15
Some wifi tweaks for more signal

untested
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>
BLX

Conflicts:

	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/power/s5pc110_battery.c

Change-Id: I24e2b722939f68e1de9ed16d66f94f1cbd41b7d4

Conflicts:

	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/power/s5pc110_battery.c
Add touchwake and BLX to configs
Change RAM values
Set Interactive as default
Bump to version 0.04
gpu: pvr: Update to DDK 1.8@2198402

 - Implemented a DC API change which queues a dummy display flip to
   workaround a rare and difficult to reproduce synchronization
   deadlock.
 - Eliminate log spam from Linux shrinker integration.

Conflicts:
	drivers/gpu/pvr/pvrversion.h

Change-Id: I11fdf76b3f8bc191a0c261a120eeaa19352d66e7
gpu: pvr: bypass compat check if version is same but build # is different
Ezekeel's deep idle

Conflicts:

	drivers/misc/Makefile

Conflicts:

	arch/arm/mach-s5pv210/Makefile
	drivers/misc/Makefile
Fix Deep Idle

Also adds parameter to disable statistics
More work on Deep Idle
Add deep idle to configs
bln 9

Conflicts:

	drivers/misc/Makefile

Change-Id: Iad8c04215f35841319be403ef8b4d7b711d13262

Conflicts:

	drivers/input/keyboard/cypress-touchkey.c
	drivers/misc/Kconfig

Conflicts:

	drivers/misc/Makefile
forgot this, also bln 9
bln: Fix kernel panic caused by BUG() in timer.c
Check to see if blink_timer is pending before attempting to add it.
If it is pending, use mod_timer to change the timeout.
Adding regardless results in a BUG() and a subsequent panic.