]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'imx/imx6q' into next/soc
authorArnd Bergmann <arnd@arndb.de>
Wed, 2 Nov 2011 01:46:55 +0000 (02:46 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 2 Nov 2011 01:46:55 +0000 (02:46 +0100)
commit951c5cc05f184690253016045a537fef1b566025
tree4e3333cde6da6c49dcd81920410bf5a33055f03a
parentf6a01520234b2ddfe4b6da9ca2dc77a2643a7316
parent59d24c515ed4f1ccb4e3e6dca71e09aba29b6da6
Merge branch 'imx/imx6q' into next/soc

Conflicts:
Documentation/devicetree/bindings/arm/fsl.txt
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/plat-mxc/include/mach/common.h
Documentation/devicetree/bindings/arm/fsl.txt
MAINTAINERS
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/Makefile
arch/arm/mm/Kconfig
arch/arm/plat-mxc/include/mach/common.h