diff --git a/[refs] b/[refs]
index 034793fc77fa..b2848c65e0bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5eb806a3a68920a9f373f18b03fa14852047e62b
+refs/heads/master: dbabe0d659d3cfe42830a779909ab3cd42f7b027
diff --git a/trunk/include/linux/spi/spi.h b/trunk/include/linux/spi/spi.h
index 98679b061b63..fa702aeb5038 100644
--- a/trunk/include/linux/spi/spi.h
+++ b/trunk/include/linux/spi/spi.h
@@ -254,7 +254,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv)
  *	driver is finished with this message, it must call
  *	spi_finalize_current_message() so the subsystem can issue the next
  *	transfer
- * @prepare_transfer_hardware: there are currently no more messages on the
+ * @unprepare_transfer_hardware: there are currently no more messages on the
  *	queue so the subsystem notifies the driver that it may relax the
  *	hardware by issuing this call
  *