Merge remote-tracking branch 'omap_dss2/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 01:51:39 +0000 (12:51 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 01:51:39 +0000 (12:51 +1100)
1  2 
drivers/video/fbdev/tridentfb.c

Simple merge