-From 8b0e1ce37709125edeb9851307e24ba563749382 Mon Sep 17 00:00:00 2001
+From ea95a310d42c86fa9ebd87d01d486c81770868b9 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Tue, 8 Dec 2015 14:00:43 -0800
-Subject: [PATCH 118/127] drm/vc4: A few more non-functional changes to sync to
+Subject: [PATCH 118/156] drm/vc4: A few more non-functional changes to sync to
upstream.
At this point all that's left is the force-enable of HDMI connector,