Learn more about cloning repositories
You have read-only access
Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev-next Conflicts: drivers/video/omap2/dss/core.c drivers/video/omap2/dss/dispc.c
