-From ea95a310d42c86fa9ebd87d01d486c81770868b9 Mon Sep 17 00:00:00 2001
+From 50a1843ffd2e6f408dcb6a64ca0a2ef3b062fd5a 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/156] drm/vc4: A few more non-functional changes to sync to
+Subject: [PATCH 118/170] 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,