Florian Tobias Schandinat d4a7dbfdf1 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x into fbdev-next ... Conflicts: drivers/video/atmel_lcdfb.c		2011-08-29 09:14:30 +00:00
..
Makefile
mddi.c	treewide: Fix iomap resource size miscalculations	2011-04-10 17:01:04 +02:00
mddi_client_dummy.c
mddi_client_nt35399.c
mddi_client_toshiba.c
mddi_hw.h
mdp.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x into fbdev-next	2011-08-29 09:14:30 +00:00
mdp_csc_table.h
mdp_hw.h
mdp_ppp.c
mdp_scale_tables.c
mdp_scale_tables.h
msm_fb.c	treewide: Convert uses of struct resource to resource_size(ptr)	2011-06-10 14:55:36 +02:00