]> 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, 27 Sep 2011 03:46:54 +0000 (13:46 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 03:46:54 +0000 (13:46 +1000)
commita1e307b9c9b542189cc33997b108fb8114d09b70
tree0cccaa92dba14bef53e3c9f9f101635f72762796
parent9b68c2db5a1ed1775579b3755e827da3d095842f
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