-From 95ab064c34db2cc7e99a003277e824aa29a60d98 Mon Sep 17 00:00:00 2001
+From 7d4ed9f40e9484ded3965b13fbb7914a1daf85d7 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Fri, 11 Dec 2015 19:45:03 -0800
-Subject: [PATCH 116/156] drm: Use the driver's gem_object_free function from
+Subject: [PATCH 116/170] drm: Use the driver's gem_object_free function from
CMA helpers.
VC4 wraps the CMA objects in its own structures, so it needs to do its