]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'fbdev/fbdev-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 02:49:49 +0000 (13:49 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 02:49:49 +0000 (13:49 +1100)
commit431b7ee4ee9009a8114a39e89ff11093875ba8fc
tree567acccbc66ecb5cfacbd003732234468516ae7f
parent9336675fb823501ac2166fa0f23d81948f885e69
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