Commits

Merge remote branch 'fsl-linux-sdk/imx_3.0.15_12.02.01' into imx_3.0.15_android Conflicts: arch/arm/mach-mx6/clock.c arch/arm/plat-mxc/devices/platform-imx-perfmon.c drivers/usb/gadget/arcotg_udc.c
Merge remote branch 'fsl-linux-sdk/imx_3.0.15_12.02.01' into imx_3.0.15_android Conflicts: arch/arm/mach-mx6/clock.c arch/arm/plat-mxc/devices/platform-imx-perfmon.c drivers/usb/gadget/arcotg_udc.c