]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev...
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Mon, 29 Aug 2011 09:14:30 +0000 (09:14 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Mon, 29 Aug 2011 09:14:30 +0000 (09:14 +0000)
commitc501eb85c48a3994bd2f4a6533c2b19bcdcee4e3
treef7d0d548004751aea77f63e6fd695faf0785bde0
parent3126915731ba7ec8e2a868fde0ed0c9e4030bb62
parent60728efce9922de510ecf2a6c12a4c97ae559739
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
arch/powerpc/platforms/85xx/p1022_ds.c
arch/powerpc/platforms/86xx/mpc8610_hpcd.c
arch/powerpc/sysdev/fsl_soc.h
drivers/video/Kconfig
drivers/video/backlight/adp8860_bl.c
drivers/video/controlfb.c
drivers/video/fb_defio.c
drivers/video/msm/mdp.c
drivers/video/platinumfb.c
drivers/video/udlfb.c
drivers/video/via/viafbdev.c