diff --git a/[refs] b/[refs]
index faefd8e2cc21..99d2adbcd339 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4740d387f3cb9e63f48f2488815b38a2c92755c8
+refs/heads/master: 3bd0f6943520e459659d10f3282285e43d3990f1
diff --git a/trunk/drivers/spi/spi.c b/trunk/drivers/spi/spi.c
index 7d215eaa1370..270e6211c2e3 100644
--- a/trunk/drivers/spi/spi.c
+++ b/trunk/drivers/spi/spi.c
@@ -366,6 +366,7 @@ spi_alloc_master(struct device *dev, unsigned size)
 
 	class_device_initialize(&master->cdev);
 	master->cdev.class = &spi_master_class;
+	kobj_set_kset_s(&master->cdev, spi_master_class.subsys);
 	master->cdev.dev = get_device(dev);
 	spi_master_set_devdata(master, &master[1]);