]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'omap-pending/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 00:44:29 +0000 (10:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 00:44:29 +0000 (10:44 +1000)
commitb14df794f7bf1d1a66dcc762ad446d81415f38f3
tree8082f6f315013e32b0be2c97bd1fa6d705a0ea96
parent9d83f0c70e534ae357233217e4ebd380c6a183c2
parent30aa18d3bea5f9470af5aa48ab8df88bde97c795
Merge remote-tracking branch 'omap-pending/for-next'

Conflicts:
arch/arm/mach-omap2/omap_hwmod_43xx_data.c