diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-10-09 16:47:47 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-10-09 16:47:47 +0800 |
| commit | eba86309d9ba74153b7853cd8fb97f2484679219 (patch) | |
| tree | 2eca312c9a1dde28c0e376156e5cad1704de08c9 /arch/arm/plat-mxc/utmixc.c | |
| parent | 58d8257e51439a6c1ac2c95441f7ec119568dd5b (diff) | |
| parent | 45c27e3123e45eb27f3e5933862936e9beda38cd (diff) | |
Merge remote branch 'fsl-linux-sdk/imx_3.0.35' into imx_3.0.35_android
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/pm.c
arch/arm/mach-mx6/system.c
arch/arm/plat-mxc/cpufreq.c
drivers/mfd/mxc-hdmi-core.c
drivers/power/sabresd_battery.c
drivers/video/mxc/mxc_ipuv3_fb.c
drivers/video/mxc_hdmi.c
include/linux/mfd/mxc-hdmi-core.h
Diffstat (limited to 'arch/arm/plat-mxc/utmixc.c')
0 files changed, 0 insertions, 0 deletions