diff --git a/[refs] b/[refs]
index bc9430f64567..9d5a14cfec05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: daacd5b27f8d5b19ea65dc4ad9929c94c0ef3e35
+refs/heads/master: b55b4b7a109f218fc25b9451934ff4d9100e691c
diff --git a/trunk/drivers/media/dvb/dvb-usb/af9035.c b/trunk/drivers/media/dvb/dvb-usb/af9035.c
index e822706629db..9f962428368c 100644
--- a/trunk/drivers/media/dvb/dvb-usb/af9035.c
+++ b/trunk/drivers/media/dvb/dvb-usb/af9035.c
@@ -932,9 +932,9 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
 }
 
 enum af9035_id_entry {
-	AF9035_0CCD_0093,
 	AF9035_15A4_9035,
 	AF9035_15A4_1001,
+	AF9035_0CCD_0093,
 	AF9035_07CA_A835,
 	AF9035_07CA_B835,
 	AF9035_07CA_1867,
@@ -943,12 +943,12 @@ enum af9035_id_entry {
 };
 
 static struct usb_device_id af9035_id[] = {
-	[AF9035_0CCD_0093] = {
-		USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_STICK)},
 	[AF9035_15A4_9035] = {
 		USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035)},
 	[AF9035_15A4_1001] = {
 		USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035_2)},
+	[AF9035_0CCD_0093] = {
+		USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_STICK)},
 	[AF9035_07CA_A835] = {
 		USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A835)},
 	[AF9035_07CA_B835] = {
@@ -1004,15 +1004,15 @@ static struct dvb_usb_device_properties af9035_properties[] = {
 		.num_device_descs = 5,
 		.devices = {
 			{
-				.name = "TerraTec Cinergy T Stick",
+				.name = "Afatech AF9035 reference design",
 				.cold_ids = {
-					&af9035_id[AF9035_0CCD_0093],
+					&af9035_id[AF9035_15A4_9035],
+					&af9035_id[AF9035_15A4_1001],
 				},
 			}, {
-				.name = "Afatech Technologies DVB-T stick",
+				.name = "TerraTec Cinergy T Stick",
 				.cold_ids = {
-					&af9035_id[AF9035_15A4_9035],
-					&af9035_id[AF9035_15A4_1001],
+					&af9035_id[AF9035_0CCD_0093],
 				},
 			}, {
 				.name = "AVerMedia AVerTV Volar HD/PRO (A835)",