]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'l2-mtd/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 00:40:14 +0000 (10:40 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 00:40:14 +0000 (10:40 +1000)
commit147c530f634634e811af0967caf00b2426df1c0d
tree3e3b4529492f4cc1e29208277208544317151cec
parent5828961a2f0dcf4d40beb6cb2f9eb962572e9572
parentcd0a30d5deb09f0254c58be5bb4ec45c1d659a37
Merge remote-tracking branch 'l2-mtd/master'

Conflicts:
arch/arm/mach-imx/clk-imx6q.c