]> 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, 21 Sep 2011 02:47:23 +0000 (12:47 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 02:47:23 +0000 (12:47 +1000)
commit6d7f6e62f861884ed5139324bd6d8c53f307ce89
tree6f1782d6cef1ba36d93fbf69134af871261fba91
parentfda67ae29fb51f9b0645ef8ec7c4b712e0abaa30
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