]> 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, 29 Sep 2011 03:46:09 +0000 (13:46 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 03:46:09 +0000 (13:46 +1000)
commit077e6bf34e9496a7fc5deea2503f5a54395e088b
tree8f03a965dc82e7714b86116cf706e844eee71d5c
parent44b141130f6e0e4d67fd6a6a29e9a3bd6956c997
parent2b7a905dd0d24d14a1099653ba63b7113a82fc54
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