Fixing kernel merge conflict
(cherry picked from commit ebc0c922a6d9c518c1cd037a3225e48ea3ad8e41)

Change-Id: If3960916cf901a316b2b6235ed5f88fc210ae107
diff --git a/zImage-dtb b/zImage-dtb
index 81f438e..2995a12 100644
--- a/zImage-dtb
+++ b/zImage-dtb
Binary files differ