]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'fbdev/fbdev-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 03:03:25 +0000 (14:03 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 03:03:25 +0000 (14:03 +1100)
commit3500d862a217e3086ea3c0c6f6655d232f5b2972
tree8537328da65085d6edc83cd48289fe013c985e76
parentee4f3d03f06b4331b76ba3f0316ca1829091fd72
parent07a062140372187642003e02a49edc8a2115c1ca
Merge remote-tracking branch 'fbdev/fbdev-next'

Conflicts:
drivers/video/Kconfig
MAINTAINERS
arch/arm/mach-shmobile/board-mackerel.c
drivers/video/Kconfig
drivers/video/atmel_lcdfb.c
drivers/video/backlight/adp8870_bl.c