]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'imx-mxs/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Apr 2013 05:17:41 +0000 (16:17 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Apr 2013 05:17:41 +0000 (16:17 +1100)
commit7306306dd3fee945b5c76ebe5fdb715acd7a8e28
tree748c7a328a8190c1a37b8f60f276c20a1d8c30d7
parent6615e59e0ca17037e51c15885b9b5dda263689ac
parent6180585e63e50264a2efeadb3418987a4c22b8f5
Merge remote-tracking branch 'imx-mxs/for-next'

Conflicts:
arch/arm/Kconfig.debug
arch/arm/mach-imx/cpufreq.c
drivers/clocksource/Makefile
14 files changed:
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/boot/dts/Makefile
drivers/Kconfig
drivers/Makefile
drivers/clocksource/Makefile
drivers/i2c/busses/i2c-mxs.c
drivers/irqchip/Makefile
drivers/net/ethernet/freescale/fec_main.c
drivers/pinctrl/pinctrl-imx.c
drivers/spi/spi-mxs.c
drivers/staging/iio/adc/mxs-lradc.c
drivers/staging/imx-drm/ipu-v3/ipu-common.c
sound/soc/mxs/mxs-saif.c