Conflicts:
	arch/arm/boot/dts/Makefile
	arch/arm/boot/dts/imx6sx.dtsi
	arch/arm/mach-imx/clk-imx6sx.c
	arch/arm/mach-imx/mach-imx6sx.c
	drivers/dma/pxp/pxp_dma_v2.c
	drivers/media/platform/mxc/capture/csi_v4l2_capture.c
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h
	drivers/pwm/pwm-imx.c
	include/dt-bindings/clock/imx6sx-clock.h

Conflicts:
	arch/arm/common/Kconfig
	arch/arm/common/Makefile
	arch/arm/mm/mmu.c
	drivers/input/Kconfig
	drivers/input/Makefile
	drivers/input/evdev.c
	drivers/input/keyreset.c
	drivers/input/misc/gpio_event.c
	drivers/of/fdt.c
	drivers/staging/android/Kconfig
	drivers/staging/android/Makefile
	drivers/staging/android/ion/Kconfig
	drivers/staging/android/ion/Makefile
	drivers/staging/android/ion/ion.c
	drivers/usb/gadget/android.c
	drivers/usb/phy/Kconfig
	drivers/usb/phy/Makefile
	drivers/video/Kconfig
	drivers/video/adf/adf.c
	drivers/video/adf/adf_memblock.c
	include/linux/keyreset.h
	include/linux/mm_types.h
	include/linux/wakelock.h
	include/net/tcp.h
	include/uapi/linux/prctl.h
	include/video/adf_fbdev.h
	kernel/cpu.c
	kernel/futex.c
	kernel/power/Kconfig
	kernel/power/Makefile
	kernel/power/wakeup_reason.c
	kernel/sys.c
	net/ipv4/ping.c
	net/ipv4/sysctl_net_ipv4.c
	net/ipv6/ping.c
	net/ipv6/route.c
	net/netfilter/xt_IDLETIMER.c

commit e6d30ab1e7d1281784672c0fc2ffa385cfb7279e upstream.

All the callers of irq_create_of_mapping() pass the contents of a struct
of_phandle_args structure to the function. Since all the callers already
have an of_phandle_args pointer, why not pass it directly to
irq_create_of_mapping()?

Signed-off-by: Grant Likely <grant.likely@linaro.org>
Acked-by: Michal Simek <monstr@monstr.eu>
Acked-by: Tony Lindgren <tony@atomide.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>

Conflicts:
	arch/arm/mach-integrator/pci_v3.c
	arch/mips/pci/pci-rt3883.c
	kernel/irq/irqdomain.c

/sys/kernel/wakeup_reasons/last_resume_reason

Change-Id: I8ac568a7cb58c31decd379195de517ff3c6f9c65
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>

Second argument is similar to PR_SET_TIMERSLACK, if non-zero then the
slack is set to that value otherwise sets it to the default for the thread.

Takes PID of the thread as the third argument.

This allows power/performance management software to set timer slack for
other threads according to its policy for the thread (such as when the
thread is designated foreground vs. background activity)

Change-Id: I744d451ff4e60dae69f38f53948ff36c51c14a3f
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>

Enable early suspend/late resume code

Signed-off-by: Ke Qinghua <qinghua.ke@freescale.com>
Acked-by: Jason Liu

On x86, irq_count conflicts with a declaration in
arch/x86/include/asm/processor.h

Change-Id: I3e4fde0ff64ef59ff5ed2adc0ea3a644641ee0b7
Signed-off-by: Greg Hackmann <ghackmann@google.com>

Ensure the array for the wakeup reason IRQs does not overflow.

Change-Id: Iddc57a3aeb1888f39d4e7b004164611803a4d37c
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
(cherry picked from commit b5ea40cdfcf38296535f931a7e5e7bf47b6fad7f)

Add Wakelock update for android linux kernel 3.10

Signed-off-by: Ke Qinghua <qinghua.ke@freescale.com>

Change I81addaf420f1338255c5d0638b0d244a99d777d1 introduced compile
warnings, fix these.

Change-Id: I05482a5335599ab96c0a088a7d175c8d4cf1cf69
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>