]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'fbdev/fbdev-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 02:03:01 +0000 (12:03 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 02:03:01 +0000 (12:03 +1000)
commitb2492375bb05e249c6ee5abd9d2102d3eb276d91
tree9f3686127a6fd831f2910fe77c402ac098dfd1b9
parentc0c6a84be9291f380d108e739eefc138298506d4
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