Skip to content
Commit 3879f5d6 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'imx-fb-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx into devel 

Conflicts:

	drivers/video/mx3fb.c
parents 607b067e 6e1588cb
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment