power-supply: Limit the duration of psy_changed wakelocks
netfilter: qtaguid: initialize a local var to keep compiler happy.

There was a case that might have seemed like new_tag_stat was not
initialized and actually used.
Added comment explaining why it was impossible, and a BUG()
in case the logic gets changed.

Change-Id: I1eddd1b6f754c08a3bf89f7e9427e5dce1dfb081
Signed-off-by: JP Abgrall <jpa@google.com>
netfilter: xt_qtaguid: fix ipv6 protocol lookup

When updating the stats for a given uid it would incorrectly assume
IPV4 and pick up the wrong protocol when IPV6.

Change-Id: Iea4a635012b4123bf7aa93809011b7b2040bb3d5
Signed-off-by: JP Abgrall <jpa@google.com>
cpufreq: interactive: configurable delay before raising above hispeed

Change-Id: I4d6ac40b23a3790d48e30c37408284e9f955e8fa
Signed-off-by: Todd Poynor <toddpoynor@google.com>
cpufreq: interactive: adjust code and documentation to match

Change-Id: If59c668d514a29febe5c35404fd9d01df8548eb1
Signed-off-by: Todd Poynor <toddpoynor@google.com>

Conflicts:

	Documentation/cpu-freq/governors.txt
cpufreq: interactive: based hispeed bump on target freq, not actual

For systems that set a common speed for all CPUs, checking current
speed here could bypass the intermediate hispeed bump decision for
this CPU when another CPU was already at hispeed.  This could
result in an overly high setting (for all CPUs) in situations
where all CPUs were about to drop to load levels that map to
hispeed or below.

Change-Id: I186f23dcfc5e2b6336cab8b0327f0c8a9a4482bc
Signed-off-by: Todd Poynor <toddpoynor@google.com>
msm_fb: new version backported from primou 3.o kernel

Conflicts:

	drivers/video/msm/mdp.c
	drivers/video/msm/msm_fb.c
msm: vidc: missing ifdef
msm: kgsl: Allocate physical pages instead of using vmalloc

Replace vmalloc allocation with physical page allocation. For most
allocations we do not need a kernel virual address. vmalloc uses up
the kernel virtual address space. By replacing vmalloc with physical
page alloction and mapping that allocation to kernel space only
when it is required prevents the kgsl driver from using unnecessary
vmalloc virtual space.

CRs-Fixed: 346921

Signed-off-by: Harsh Vardhan Dwivedi <hdwivedi@codeaurora.org>
(cherry picked from commit 8cb835b656ae2c3faa79af4f374563d344b46d4a)

Conflicts:

	drivers/gpu/msm/kgsl_sharedmem.c

Change-Id: I88e1eb282cc4822970811728d00b1096188f64e9
Signed-off-by: Ram Kumar Chakravarthy Chebathini <rcheba@codeaurora.org>
semaphore: fix compiling error
vision: add HW VSYNC support
drivers: net: wireless: bcmdhd: inital import of bcmdhd driver from CAF msm-3.0
Makefile derp?
touchscreen/atmel: fix driver to follow evdev protocol

This makes it possible to drop the LEGACY_TOUCHSCREEN option in framework.
See http://source.android.com/tech/input/touch-devices.html
arm: msm_fb: add CONFIG_OVERLAY_FORCE_UPDATE support.

squash changes for glacier and speedy into one commit

glacier: msmfb: fix overlays

Glacier's overlays do not update the screen with just
MSMFB_OVERLAY_PLAY - a manual update must be done.

HTC chose to do this in android::Overlay::queueBuffer, but I
have opted to place this support in the kernel as it seemed
much cleaner this way.

Change-Id: I7475b5c98c95854beb60c3c7a2adebdd9a3bb2a7

video: msm: fix some bugs with MSM_MDP_FORCE_UPDATE

* Don't update the screen if it's not in the AWAKE state;
  Prevents hang when suspending/resuming.

* Use the requested yoffset instead of forcing it to 0

* Do forced updates as full updates; reduces choppiness, but may lag
  if updates are done while an overlay is playing.

* Add missing copyright notice

Change-Id: Id52cccd5fae29f8d75a444233796c06d0dd70c46

Conflicts:

	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/board-glacier-panel.c
update defconfig to 9.6.1
	enable Swap
	enable Cleancache
	enable Frontswap
	new msm video drivers options