arch/powerpc/platforms/85xx/p1022_ds.c · d4a7dbfdf180a656de3eb9e64614e2b991ffaa53 · Kirill Smelkov / linux

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

d4a7dbfd

p1022_ds.c 9.46 KB