diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-10-24 12:50:34 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-10-24 12:50:34 +0800 |
| commit | 5b53e2720902c5dd9fbfc9b2644484173a5146aa (patch) | |
| tree | a369ffd3a3231a0d30c306c46636ec3e87cdbf39 /drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c | |
| parent | e2f718a0c092f899e354b5179cde70f7aa7ab7a8 (diff) | |
| parent | 3101ee16f2f39b589d627b2858c5e3eca470dce7 (diff) | |
Merge remote branch 'fsl-linux-sdk/imx_3.0.35_12.11.01' into imx_3.0.35_android_r13.4.y
Conflicts:
arch/arm/configs/imx6s_updater_defconfig
arch/arm/include/asm/hardware/coresight.h
arch/arm/kernel/etm.c
arch/arm/mach-mx6/board-mx6q_sabresd.c
arch/arm/mach-mx6/cpu_op-mx6.c
arch/arm/mach-mx6/mx6_suspend.S
arch/arm/mach-mx6/mx6sl_wfi.S
arch/arm/mach-mx6/pm.c
arch/arm/mach-mx6/system.c
arch/arm/plat-mxc/cpufreq.c
drivers/media/video/mxc/capture/ov5640_mipi.c
drivers/mfd/mxc-hdmi-core.c
drivers/mmc/host/sdhci.c
drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c
drivers/power/sabresd_battery.c
drivers/video/mxc/mxc_ipuv3_fb.c
include/linux/mfd/mxc-hdmi-core.h
Diffstat (limited to 'drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_interrupt_vg.c')
0 files changed, 0 insertions, 0 deletions