diff --git a/[refs] b/[refs]
index a3df79b3f767..97dda1c6020e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d12db0b08f6c14dfd1438f6f6ad49dcd663c9ae5
+refs/heads/master: de9f0cf93fcbccc2de4e6bcb5ef90f997616be3b
diff --git a/trunk/drivers/video/sunxvr2500.c b/trunk/drivers/video/sunxvr2500.c
index 4010492c6920..4316c7fe8e21 100644
--- a/trunk/drivers/video/sunxvr2500.c
+++ b/trunk/drivers/video/sunxvr2500.c
@@ -237,14 +237,14 @@ static void __devexit s3d_pci_unregister(struct pci_dev *pdev)
 }
 
 static struct pci_device_id s3d_pci_table[] = {
-	{	/* XVR-2500 */
-		PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0032),
-		.driver_data = 1,
-	},
-	{	/* XVR-500 */
-		PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x07a2),
-		.driver_data = 0,
-	},
+	{	PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x002c),	},
+	{	PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x002d),	},
+	{	PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x002e),	},
+	{	PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x002f),	},
+	{	PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0030),	},
+	{	PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0031),	},
+	{	PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0032),	},
+	{	PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0033),	},
 	{ 0, }
 };
 
diff --git a/trunk/net/bluetooth/hci_sysfs.c b/trunk/net/bluetooth/hci_sysfs.c
index 25835403d659..359e3440cf29 100644
--- a/trunk/net/bluetooth/hci_sysfs.c
+++ b/trunk/net/bluetooth/hci_sysfs.c
@@ -322,7 +322,7 @@ int hci_register_sysfs(struct hci_dev *hdev)
 		if (device_create_file(dev, bt_attrs[i]) < 0)
 			BT_ERR("Failed to create device attribute");
 
-	if (sysfs_create_link(&bt_class->subsys.kobj,
+	if (sysfs_create_link(&bt_class->subsys.kset.kobj,
 				&dev->kobj, kobject_name(&dev->kobj)) < 0)
 		BT_ERR("Failed to create class symlink");
 
@@ -333,7 +333,7 @@ void hci_unregister_sysfs(struct hci_dev *hdev)
 {
 	BT_DBG("%p name %s type %d", hdev, hdev->name, hdev->type);
 
-	sysfs_remove_link(&bt_class->subsys.kobj,
+	sysfs_remove_link(&bt_class->subsys.kset.kobj,
 					kobject_name(&hdev->dev.kobj));
 
 	device_del(&hdev->dev);