wifi: re-enable adaptive power management
discard setting pm mode via config file
ALS: set maximum value to 10240
this should be enough and ABS is 10240 too
ALS: introduce SENSORS_APDS9900_LAZY_SENSOR_BLOB
enables polling based input device reporting instead of handling it in the irq wq

this also clears a few warnings and enables it for P940
bcmdhd: set wl_timer to upstream value
cpufreq: limit cpu freq to stock value on cpuinit
and reenable performance silicon override
bcmdhd: sync paketfilter with upstream
perf: Treat attr.config as u64 in perf_swevent_init()

Trinity discovered that we fail to check all 64 bits of
attr.config passed by user space, resulting to out-of-bounds
access of the perf_swevent_enabled array in
sw_perf_event_destroy().

Introduced in commit b0a873ebb ("perf: Register PMU
implementations").

Signed-off-by: Tommi Rantala <tt.rantala@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: davej@redhat.com
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Link: http://lkml.kernel.org/r/1365882554-30259-1-git-send-email-tt.rantala@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
mm: Hold a file reference in madvise_remove

commit 9ab4233dd08036fe34a89c7dc6f47a8bf2eb29eb upstream.

Otherwise the code races with munmap (causing a use-after-free
of the vma) or with close (causing a use-after-free of the struct
file).

The bug was introduced by commit 90ed52ebe481 ("[PATCH] holepunch: fix
mmap_sem i_mutex deadlock")

Cc: Hugh Dickins <hugh@veritas.com>
Cc: Miklos Szeredi <mszeredi@suse.cz>
Cc: Badari Pulavarty <pbadari@us.ibm.com>
Cc: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
[bwh: Backported to 3.2:
 - Adjust context
 - madvise_remove() calls vmtruncate_range(), not do_fallocate()]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Conflicts:

	mm/madvise.c
cmdline: add android standard boot pause argument

backported from u2
https://github.com/CyanogenMod/lge-kernel-omap4/commit/20bdfabccfe20535150fb4247f60d0daebbcdabc
Revert "omap-hsmmc: Prevent possible race condition"

This reverts commit 1db70565494809bf67e99969f95fbf0750ceab1a.
Revert "USB: OHCI: do not poll root hub status if HC is not running"

This reverts commit 3232cae99b9624a3f0e9596e8db55996f07067b9.
Revert "OMAP4430/60: EMIF: errata: Prohibit usage of Power-Down mode"

This reverts commit b40e500e1048cd5a242e137187c9329eb3225f80.
remove debug flag on batgauge
Revert "OMAPFB: Asynchronous vsync notification"

This reverts commit ca2285789ea1924783224bc7b3fb7625e273a118.

in preparation for omap4-common vsync changes
OMAPFB: Asynchronous vsync notification

Enabled and disabled through new OMAPFB_ENABLEVSYNC ioctl.  Events delivered
as switch events.

Change-Id: I3a40523d35e2eff3510892a4adcd6a4821c883a5
Signed-off-by: Erik Gilling <konkers@android.com>
Signed-off-by: Tony Lofthouse <a0741364@ti.com>
OMAPFB: Select correct VSYNC IRQ based on DSS channel

Select correct VSYNC IRQ for asynchronous vsync notification
based on the DSS channel.
Current VSYNC notification supports only primary LCD panel.
To support VSYNC notification for default HDMI display this
patch adds the VSYNC IRQ selection based on the DSS channel
for default display.

Change-Id: I0594e80d4b4850c278e6bdd3b07c0cb63488be39
Signed-off-by: Muralidhar Dixit <murali.dixit@ti.com>
als: reduce poll rate
omap hsi: update to lge omap4-common version
and inlude p2 in u2 ifdefs
Merge latest changes from google kernel/common.git

Kernel version updated to 3.0.31

Change-Id: Ifbd7150801f3beeec9cbaa566f249d8019ef9348
Signed-off-by: Roman Shaposhnikov <x0166637@ti.com>

Conflicts:
	drivers/usb/gadget/android.c
	fs/proc/base.c
	include/trace/events/cpufreq_interactive.h
bcmdhd: enable pktfilter for p2p fw modes
we do actually use a _p2p firmware so lets enable the paketfilter for it

inspired by iproj commit https://github.com/CyanogenMod/lge-kernel-iproj/commit/74ee8bbf3bf86983be123305ac4af3e51a5a6adb