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

..

bpf

bpf, array: fix heap out-of-bounds access when updating elements

2015-12-14 21:24:32 -08:00

configs

…

debug

kdb: support new lines without carriage returns

2015-11-19 12:37:19 -08:00

events

perf: Fix AUX buffer refcounting

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

gcov

gcov: fix softlockups

2015-04-17 09:04:08 -04:00

irq

genirq: Fix race in register_irq_proc()

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

livepatch

livepatch: add module locking around kallsyms calls

2015-07-21 10:10:04 -07:00

locking

lockdep: Fix a race between /proc/lock_stat and module unload

2015-06-07 15:46:30 +02:00

power

Merge remote-tracking branch 'fsl-linux-sdk/imx_4.1.y' into aosp android-4.1

2015-12-16 12:30:09 +08:00

printk

Merge remote-tracking branch 'fsl-linux-sdk/imx_4.1.y' into aosp android-4.1

2015-12-16 12:30:09 +08:00

rcu

rcu: Correctly handle non-empty Tiny RCU callback list with none ready

2015-07-21 10:10:01 -07:00

sched

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

time

time: Fix timekeeping_freqadjust()'s incorrect use of abs() instead of abs64()

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

trace

Merge remote-tracking branch 'fsl-linux-sdk/imx_4.1.y' into aosp android-4.1

2015-12-16 12:30:09 +08:00

.gitignore

…

acct.c

acct: check FMODE_CAN_WRITE

2015-04-11 22:27:55 -04:00

async.c

…

audit_tree.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2015-04-26 17:22:07 -07:00

audit_watch.c

VFS: audit: d_backing_inode() annotations

2015-04-15 15:06:55 -04:00

audit.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2015-04-26 17:22:07 -07:00

audit.h

Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit

2015-04-22 14:49:23 -07:00

auditfilter.c

…

auditsc.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2015-04-26 17:22:07 -07:00

backtracetest.c

…

bounds.c

…

capability.c

kernel: conditionally support non-root users, groups and capabilities

2015-04-15 16:35:22 -07:00

cgroup_freezer.c

…

cgroup.c

Merge remote-tracking branch 'fsl-linux-sdk/imx_4.1.y' into aosp android-4.1

2015-12-16 12:30:09 +08:00

compat.c

compat: cleanup coding in compat_get_bitmap() and compat_put_bitmap()

2015-06-04 23:57:18 +02:00

configs.c

…

context_tracking.c

…

cpu_pm.c

…

cpu.c

Move x86_64 idle notifiers to generic

2016-01-14 11:03:00 -06:00

cpuset.c

cpuset: use trialcs->mems_allowed as a temp variable

2015-09-13 09:07:46 -07:00

crash_dump.c

…

cred.c

kernel: conditionally support non-root users, groups and capabilities

2015-04-15 16:35:22 -07:00

delayacct.c

…

dma.c

…

elfcore.c

…

exec_domain.c

Remove rest of exec domains.

2015-04-12 21:03:31 +02:00

exit.c

Remove execution domain support

2015-04-12 20:58:24 +02:00

extable.c

…

fork.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

freezer.c

…

futex_compat.c

…

futex.c

…

groups.c

kernel: conditionally support non-root users, groups and capabilities

2015-04-15 16:35:22 -07:00

hung_task.c

kernel/hung_task.c: change hung_task.c to use for_each_process_thread()

2015-04-15 16:35:22 -07:00

irq_work.c

…

jump_label.c

…

kallsyms.c

…

kcmp.c

…

Kconfig.freezer

…

Kconfig.hz

…

Kconfig.locks

…

Kconfig.preempt

…

kexec.c

kexec: allocate the kexec control page with KEXEC_CONTROL_MEMORY_GFP

2015-04-23 16:52:01 +02:00

kmod.c

…

kprobes.c

…

ksysfs.c

…

kthread.c

…

latencytop.c

…

Makefile

modsign: change default key details

2015-04-30 09:35:41 -07:00

module_signing.c

…

module-internal.h

…

module.c

module: Fix locking in symbol_put_addr()

2015-11-09 14:33:37 -08:00

notifier.c

…

nsproxy.c

…

padata.c

…

panic.c

panic: Add board ID to panic output

2015-11-19 12:58:09 -08:00

params.c

params: handle quotes properly for values not of form foo="bar".

2015-04-15 13:31:23 +09:30

pid_namespace.c

…

pid.c

fork: report pid reservation failure properly

2015-04-17 09:04:06 -04:00

profile.c

…

ptrace.c

ptrace: ptrace_detach() can no longer race with SIGKILL

2015-04-17 09:04:06 -04:00

range.c

…

reboot.c

kernel/reboot.c: add orderly_reboot for graceful reboot

2015-04-15 16:35:23 -07:00

relay.c

VFS: kernel/: d_inode() annotations

2015-04-15 15:06:55 -04:00

resource.c

kernel/resource.c: remove deprecated __check_region() and friends

2015-04-15 16:35:22 -07:00

seccomp.c

…

signal.c

signal: fix information leak in copy_siginfo_from_user32

2015-08-16 20:52:26 -07:00

smp.c

smp: Fix error case handling in smp_call_function_*()

2015-04-19 13:19:23 -07:00

smpboot.c

smpboot: Add common code for notification from dying CPU

2015-03-11 13:20:25 -07:00

smpboot.h

…

softirq.c

…

stacktrace.c

…

stop_machine.c

…

sys_ni.c

kernel: conditionally support non-root users, groups and capabilities

2015-04-15 16:35:22 -07:00

sys.c

mm: add a field to store names for private anonymous memory

2015-11-19 12:58:21 -08:00

sysctl_binary.c

…

sysctl.c

Merge remote-tracking branch 'fsl-linux-sdk/imx_4.1.y' into aosp android-4.1

2015-12-16 12:30:09 +08:00

system_certificates.S

…

system_keyring.c

…

task_work.c

…

taskstats.c

…

test_kprobes.c

…

torture.c

…

tracepoint.c

…

tsacct.c

…

uid16.c

…

up.c

…

user_namespace.c

…

user-return-notifier.c

…

user.c

…

utsname_sysctl.c

…

utsname.c

…

watchdog.c

hardlockup: detect hard lockups without NMIs using secondary cpus

2015-11-19 12:58:24 -08:00

workqueue_internal.h

…

workqueue.c

workqueue: make sure delayed work run in local cpu

2015-10-27 09:51:56 +09:00