diff --git a/[refs] b/[refs]
index 7d3a89ade34a..411bcf9c2899 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d3952a7dfa80919842bbe01ac7f693d40a1eb84
+refs/heads/master: 41962f90c605983fb04c23bab9c060c9f49ee4c3
diff --git a/trunk/Documentation/devicetree/bindings/spi/spi-bus.txt b/trunk/Documentation/devicetree/bindings/spi/spi-bus.txt
index e782add2e457..d2c33d0f533e 100644
--- a/trunk/Documentation/devicetree/bindings/spi/spi-bus.txt
+++ b/trunk/Documentation/devicetree/bindings/spi/spi-bus.txt
@@ -21,6 +21,9 @@ assumption that board specific platform code will be used to manage
 chip selects.  Individual drivers can define additional properties to
 support describing the chip select layout.
 
+Optional property:
+- num-cs : total number of chipselects
+
 SPI slave nodes must be children of the SPI master node and can
 contain the following properties.
 - reg             - (required) chip select address of device.