]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'fbdev/fbdev-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Sep 2011 06:22:47 +0000 (16:22 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Sep 2011 06:22:47 +0000 (16:22 +1000)
commit5e3b2a7c1d3b4a849775e22061d4bdc00bf0a263
tree5e1b72a3d5deaea7c69ad9007d93b172b59de78b
parentc7c0b3a61d2f523b1fecabb9b30f16a89e23ff78
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