On Sun, 2009-03-15 at 21:10 -0700, Stephen Rothwell wrote:
> Hi Dan, Russell,
>
> Today's linux-next merge of the async_tx tree got a conflict in
> drivers/video/mx3fb.c between commit
> 9eb2eb8c40ffd30da322648c4415bae0288eb167 ("MX31 clkdev support") from the
> arm tree and commits 1febd91acff907152e61eb5ad0a82dd8d7db21c6 ("Revert
> "i.MX31: framebuffer driver"") and
> 6e1588cbd88590273300403648aef70e6bdaf5af ("i.MX31: framebuffer driver")
> from the async_tx tree.
>
> I fixed it up (see below) and can carry the fix as necessary).
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
> http://www.canb.auug.org.au/~sfr/
Thanks Stephen!
Russell, if you are merging other changes for this driver it makes sense
for the tabs-to-space fix to go in through your tree as well. If you
agree please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git imx-fb-fix
...to receive:
Dan Williams (1):
Revert "i.MX31: framebuffer driver"
Guennadi Liakhovetski (1):
i.MX31: framebuffer driver
arch/arm/plat-mxc/include/mach/mx3fb.h | 26 +-
drivers/video/Kconfig | 20 +-
drivers/video/Makefile | 2 +-
drivers/video/mx3fb.c | 2300 ++++++++++++++++----------------
4 files changed, 1174 insertions(+), 1174 deletions(-)
Thanks,
Dan
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
