]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'imx-mxs/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Mar 2013 04:37:08 +0000 (15:37 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Mar 2013 04:37:08 +0000 (15:37 +1100)
commitefff33cf9bdd755018226fbe7c2bd995d61480dc
tree5c64ed5987add5cffd97ab582fc98def6eb9f77d
parent36aefa550c08e244253eee0e6dce69d3a60b02b4
parent5e56049aa6d517358a041e2bf51913d6aa6f94a0
Merge remote-tracking branch 'imx-mxs/for-next'

Conflicts:
arch/arm/mach-imx/mach-imx6q.c
arch/arm/boot/dts/Makefile
arch/arm/mach-imx/mach-imx6q.c
drivers/net/ethernet/freescale/fec.h
drivers/net/ethernet/freescale/fec_main.c
drivers/pinctrl/pinctrl-imx.c