| commit | abc3f126ac736280c68db6472eb0040ddf6e1b1f | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Wed Nov 02 02:46:55 2011 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Wed Nov 02 02:46:55 2011 +0100 |
| tree | 4e3333cde6da6c49dcd81920410bf5a33055f03a | |
| parent | b8df0ea26ac17c9a073f235c7fdfbdd1851b59ea [diff] | |
| parent | 8bcb97659656042f3132b2814b19709856aa1335 [diff] |
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