]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'fbdev/fbdev-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 03:34:13 +0000 (14:34 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 03:34:13 +0000 (14:34 +1100)
commit072eee3b3a99e8c53498403e325c946ba6dab2c7
tree4a1e64d6652d29e824a2028c0ae877221c684977
parentccbdd3a19c65a1f7a3e407e8a58d436944785f96
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