]> 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>
Fri, 2 Aug 2013 06:54:31 +0000 (16:54 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 Aug 2013 06:54:31 +0000 (16:54 +1000)
commita7d88588fa7de8fc78e072a3a836ae82d297be2b
treefe440410750c4bf40200a20344342725cce345b9
parenta746466dae9d8dcdf7d908c982548df022373047
parent184b94c7b0fbeaac1d203bbe9bee6379e8d6a1e5
Merge remote-tracking branch 'imx-mxs/for-next'

Conflicts:
arch/arm/Kconfig.debug
arch/arm/Kconfig.debug
arch/arm/mach-imx/Kconfig