-From 318f2b30c2d6760e17a68580370fe62cc65b6db7 Mon Sep 17 00:00:00 2001
+From b07c427a7732a0fabcf521085e0fd61b0ef9047c Mon Sep 17 00:00:00 2001
From: Andrew Litt <ajlitt@splunge.net>
Date: Mon, 11 Jan 2016 07:54:21 +0000
-Subject: [PATCH 125/156] bcm2835-mmc: Don't override bus width capabilities
+Subject: [PATCH 125/170] bcm2835-mmc: Don't override bus width capabilities
from devicetree
Take out the force setting of the MMC_CAP_4_BIT_DATA host capability