]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'omap_dss2/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 04:15:06 +0000 (14:15 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 04:15:06 +0000 (14:15 +1000)
1  2 
drivers/gpu/drm/omapdrm/omap_connector.c
include/video/omapdss.h

Simple merge