diff --git a/[refs] b/[refs]
index 1c3ca2d9e52f..7d8ec4616cab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7183f337fef677165d3dbd09a42ee9578c94f890
+refs/heads/master: e97e6c4f9a5d23a1bd7141b6fa73e2f96282c03d
diff --git a/trunk/drivers/staging/ccg/ccg.c b/trunk/drivers/staging/ccg/ccg.c
index a5b36a97598d..c50fa020e5c8 100644
--- a/trunk/drivers/staging/ccg/ccg.c
+++ b/trunk/drivers/staging/ccg/ccg.c
@@ -1143,7 +1143,7 @@ static int ccg_bind(struct usb_composite_dev *cdev)
 	if (gcnum >= 0)
 		device_desc.bcdDevice = cpu_to_le16(0x0200 + gcnum);
 	else {
-		pr_warning("%s: controller '%s' not recognized\n",
+		pr_warn("%s: controller '%s' not recognized\n",
 			longname, gadget->name);
 		device_desc.bcdDevice = __constant_cpu_to_le16(0x9999);
 	}