]> 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, 20 Sep 2011 04:14:58 +0000 (14:14 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Sep 2011 04:14:58 +0000 (14:14 +1000)
commitc10f718ca089744e376caffde9090b4cb2ca20e3
tree114aa5fdecc6c1c180d1a9482f758c4cf121e1dd
parent3ca92799030a09427d61d2b2c5200b055948d300
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