-From 69d97bffaad932f5ba5c5b1ad347ad0495a55117 Mon Sep 17 00:00:00 2001
+From 75defab728c1b4d301459b7f2c89bf4276014c47 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Fri, 1 Jul 2016 22:09:24 +0100
-Subject: [PATCH 012/773] spi-bcm2835: Disable forced software CS
+Subject: [PATCH 012/782] spi-bcm2835: Disable forced software CS
Select software CS in bcm2708_common.dtsi, and disable the automatic
conversion in the driver to allow hardware CS to be re-enabled with an