guoyin.chen cd391781e7 Merge remote-tracking branch 'fsl-linux-sdk/imx_4.1.y' into imx_4.1.y_android ...

Conflicts:
	arch/arm/boot/dts/Makefile
	arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
	arch/arm/boot/dts/imx6qdl-sabresd.dtsi
	arch/arm/boot/dts/imx6qp-sabresd.dts
	arch/arm/boot/dts/imx6sl-evk.dts
	arch/arm/boot/dts/imx6sl.dtsi
	arch/arm/boot/dts/imx6sx-14x14-arm2.dts
	arch/arm/boot/dts/imx6sx-19x19-arm2.dts
	arch/arm/boot/dts/imx6sx-sabreauto.dts
	arch/arm/boot/dts/imx6sx-sdb-btwifi.dts
	arch/arm/boot/dts/imx6sx-sdb.dtsi
	arch/arm/boot/dts/imx6sx.dtsi
	arch/arm/boot/dts/imx6ul-14x14-evk.dts
	arch/arm/boot/dts/imx6ul-9x9-evk.dts
	arch/arm/boot/dts/imx6ul-evk-btwifi.dtsi
	arch/arm/boot/dts/imx6ul-pinfunc.h
	arch/arm/boot/dts/imx6ul.dtsi
	arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
	arch/arm/boot/dts/imx7d-pinfunc.h
	arch/arm/boot/dts/imx7d-sdb-epdc.dtsi
	arch/arm/boot/dts/imx7d-sdb-m4.dtsi
	arch/arm/boot/dts/imx7d-sdb-reva-touch.dts
	arch/arm/boot/dts/imx7d-sdb-reva.dts
	arch/arm/boot/dts/imx7d-sdb.dts
	arch/arm/boot/dts/imx7d.dtsi
	arch/arm/configs/imx_v7_defconfig
	arch/arm/configs/imx_v7_mfg_defconfig
	arch/arm/mach-imx/clk-imx6q.c
	arch/arm/mach-imx/clk.h
	arch/arm/mach-imx/cpuidle-imx7d.c
	arch/arm/mach-imx/ddr3_freq_imx7d.S
	arch/arm/mach-imx/gpcv2.c
	arch/arm/mach-imx/imx7d_low_power_idle.S
	arch/arm/mach-imx/lpddr3_freq_imx.S
	arch/arm/mach-imx/mach-imx7d.c
	arch/arm/mach-imx/pm-imx7.c
	arch/arm/mach-imx/suspend-imx7.S
	drivers/ata/ahci_imx.c
	drivers/cpufreq/imx6q-cpufreq.c
	drivers/dma/imx-sdma.c
	drivers/dma/pxp/pxp_dma_v2.c
	drivers/input/touchscreen/ads7846.c
	drivers/media/platform/mxc/capture/ov5640_mipi.c
	drivers/media/platform/mxc/output/mxc_pxp_v4l2.c
	drivers/mmc/core/core.c
	drivers/mmc/core/sd.c
	drivers/mtd/spi-nor/fsl-quadspi.c
	drivers/mxc/gpu-viv/Kbuild
	drivers/mxc/gpu-viv/config
	drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.c
	drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_context.h
	drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.c
	drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_hardware.h
	drivers/mxc/gpu-viv/hal/kernel/arch/gc_hal_kernel_recorder.c
	drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.c
	drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_command_vg.h
	drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.c
	drivers/mxc/gpu-viv/hal/kernel/archvg/gc_hal_kernel_hardware_vg.h
	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_command_vg.c
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_debug.c
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_heap.c
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu_vg.c
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_power.c
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_precomp.h
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_security.c
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.h
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h
	drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_array.h
	drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_dmabuf.c
	drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_array.h
	drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/freescale/gc_hal_kernel_allocator_cma.c
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.c
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_allocator.h
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debug.h
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.c
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_debugfs.h
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_iommu.c
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.c
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_math.c
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_mutex.h
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.h
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_platform.h
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_probe.c
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_security_channel.c
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.c
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h
	drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c
	drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.config
	drivers/mxc/hdmi-cec/mxc_hdmi-cec.c
	drivers/mxc/ipu3/ipu_common.c
	drivers/mxc/mlb/mxc_mlb.c
	drivers/net/ethernet/freescale/fec_main.c
	drivers/net/wireless/bcmdhd/dhd_linux.c
	drivers/net/wireless/bcmdhd/dhd_sdio.c
	drivers/scsi/scsi_error.c
	drivers/spi/spi-imx.c
	drivers/thermal/imx_thermal.c
	drivers/tty/serial/imx.c
	drivers/usb/chipidea/udc.c
	drivers/usb/gadget/configfs.c
	drivers/video/fbdev/mxc/mipi_dsi.c
	drivers/video/fbdev/mxc/mipi_dsi.h
	drivers/video/fbdev/mxc/mipi_dsi_samsung.c
	drivers/video/fbdev/mxc/mxc_edid.c
	drivers/video/fbdev/mxc/mxc_epdc_fb.c
	drivers/video/fbdev/mxc/mxc_epdc_v2_fb.c
	drivers/video/fbdev/mxc/mxc_ipuv3_fb.c
	drivers/video/fbdev/mxc/mxcfb_hx8369_wvga.c
	drivers/video/fbdev/mxsfb.c
	firmware/imx/sdma/sdma-imx6q.bin.ihex
	include/trace/events/cpufreq_interactive.h

2016-01-19 11:00:14 +08:00

..

auto_group.c

sched/autogroup: Fix failure to set cpu.rt_runtime_us

2015-02-18 16:17:20 +01:00

auto_group.h

…

clock.c

kernel/sched/clock.c: add another clock for use with the soft lockup watchdog

2015-02-12 18:54:13 -08:00

completion.c

sched/completion: Serialize completion_done() with complete()

2015-02-18 14:27:40 +01:00

core.c

Merge remote-tracking branch 'fsl-linux-sdk/imx_4.1.y' into imx_4.1.y_android

2016-01-19 11:00:14 +08:00

cpuacct.c

…

cpuacct.h

…

cpudeadline.c

sched/deadline: Remove cpu_active_mask from cpudl_find()

2015-02-04 07:52:29 +01:00

cpudeadline.h

sched/deadline: Modify cpudl::free_cpus to reflect rd->online

2015-01-30 19:39:16 +01:00

cpupri.c

…

cpupri.h

sched/cpupri: Remove unnecessary definitions in cpupri.h

2014-11-16 10:58:59 +01:00

cputime.c

sched, time: Fix build error with 64 bit cputime_t on 32 bit systems

2014-10-03 05:46:55 +02:00

deadline.c

sched/deadline: Support DL task migration during CPU hotplug

2015-04-02 17:42:57 +02:00

debug.c

sched: Track group sched_entity usage contributions

2015-03-27 09:35:58 +01:00

fair.c

sched/fair: Prevent throttling in early pick_next_task_fair()

2015-10-22 14:43:20 -07:00

features.h

sched/rt: Use IPI to trigger RT task push migration instead of pulling

2015-03-23 10:55:22 +01:00

idle_task.c

sched: Provide update_curr callbacks for stop/idle scheduling classes

2014-11-23 14:14:40 -08:00

idle.c

cpuidle: Run tick_broadcast_exit() with disabled interrupts

2015-04-29 15:19:21 +02:00

Makefile

ftrace: allow architectures to specify ftrace compile options

2015-01-29 09:19:19 +01:00

proc.c

…

rt.c

sched/core: Remove unused argument from init_[rt|dl]_rq()

2015-04-02 17:42:55 +02:00

sched.h

sched/core: Fix TASK_DEAD race in finish_task_switch()

2015-10-22 14:43:14 -07:00

stats.c

sched: use %*pb[l] to print bitmaps including cpumasks and nodemasks

2015-02-13 21:21:37 -08:00

stats.h

…

stop_task.c

sched: Provide update_curr callbacks for stop/idle scheduling classes

2014-11-23 14:14:40 -08:00

wait.c

sched/wait: Fix a kthread race with wait_woken()

2014-11-04 07:17:44 +01:00