]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'fbdev/fbdev-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 03:26:43 +0000 (14:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 03:26:43 +0000 (14:26 +1100)
commit4ea827b45a1d28836ec397a7d5c0031810300f88
tree6eeb6dc6f91889fe0818225aebb01084d5ca30ae
parent8cca88242ed5a1b41ddb9ba75c2936dded8e15ec
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