git.stricted.de - GitHub/moto-9609/android_kernel_motorola

author	Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
	Mon, 29 Aug 2011 09:14:30 +0000 (09:14 +0000)
committer	Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
	Mon, 29 Aug 2011 09:14:30 +0000 (09:14 +0000)
commit	d4a7dbfdf180a656de3eb9e64614e2b991ffaa53
tree	f7d0d548004751aea77f63e6fd695faf0785bde0	tree \| snapshot (tar.gz zip)
parent	b5480ed72e4f299c53d1857faaf4f492650ccc43	commit \| diff
parent	fa514fbc57419505d0e9423dbb8742f2775f882e	commit \| diff

Merge branch 'master' of git://git./linux/kernel/git/lethal/fbdev-3.x into fbdev-next

Conflicts:
drivers/video/atmel_lcdfb.c

arch/powerpc/platforms/85xx/p1022_ds.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/86xx/mpc8610_hpcd.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/sysdev/fsl_soc.h	diff1 \|	diff2 \|	blob \| history
drivers/video/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/video/backlight/adp8860_bl.c	diff1 \|	diff2 \|	blob \| history
drivers/video/controlfb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/fb_defio.c	diff1 \|	diff2 \|	blob \| history
drivers/video/msm/mdp.c	diff1 \|	diff2 \|	blob \| history
drivers/video/platinumfb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/udlfb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/via/viafbdev.c	diff1 \|	diff2 \|	blob \| history