]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'fbdev/fbdev-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 02:51:42 +0000 (13:51 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 02:51:42 +0000 (13:51 +1100)
commit1df1aed8d3436798ffdcabb2547baa4a3aabdfbc
treea43a8f40aeef33b6c1d5fc8b6338beb7820b4e0b
parent81c80ae896f5115479f7e75a5423ae5473feb60d
parent07a062140372187642003e02a49edc8a2115c1ca
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