Florian Tobias Schandinat d9053b4879 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
2012-07-25 08:55:46 +00:00
..
2012-05-20 20:25:59 +03:00
2012-06-12 15:29:21 -07:00
2012-05-22 02:58:55 +02:00