diff --git a/[refs] b/[refs]
index 5806b244c910..fee81b6b8fed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af5728e08afab1baeb97cc881e2d6158c69bae19
+refs/heads/master: 5f01f7f301db567a7a2b99d012db1c408ce0e9de
diff --git a/trunk/drivers/staging/quickstart/quickstart.c b/trunk/drivers/staging/quickstart/quickstart.c
index 352b7ecd6cbb..cac320738142 100644
--- a/trunk/drivers/staging/quickstart/quickstart.c
+++ b/trunk/drivers/staging/quickstart/quickstart.c
@@ -209,8 +209,9 @@ static int quickstart_acpi_ghid(struct quickstart_acpi *quickstart)
 		quickstart->button->id = *(uint64_t *)buffer.pointer;
 		break;
 	default:
-		pr_err("%s GHID method returned buffer of unexpected length %u\n",
-				quickstart->button->name, buffer.length);
+		pr_err("%s GHID method returned buffer of unexpected length %lu\n",
+				quickstart->button->name,
+				(unsigned long)buffer.length);
 		ret = -EINVAL;
 		break;
 	}