Merge remote-tracking branch 'drm-misc/topic/drm-misc'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 01:12:45 +0000 (12:12 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 01:12:45 +0000 (12:12 +1100)
1  2 
drivers/gpu/drm/tegra/fb.c

Simple merge