Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git

# Conflicts:
#	drivers/video/fbdev/amba-clcd.c
#	drivers/video/fbdev/vermilion/vermilion.c