diff --git a/[refs] b/[refs]
index ba982b8abc3d..c65fa8858a31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a72d47563bce9542b9a83521a4e8175076278ee9
+refs/heads/master: 0654a6d3c7a777ddccd35c5bbc5765ffbfe3ea96
diff --git a/trunk/drivers/acpi/utilities/utdebug.c b/trunk/drivers/acpi/utilities/utdebug.c
index 9e9054e155c1..8ba8624b4b7b 100644
--- a/trunk/drivers/acpi/utilities/utdebug.c
+++ b/trunk/drivers/acpi/utilities/utdebug.c
@@ -180,9 +180,8 @@ acpi_ut_debug_print(u32 requested_debug_level,
 	if (thread_id != acpi_gbl_prev_thread_id) {
 		if (ACPI_LV_THREADS & acpi_dbg_level) {
 			acpi_os_printf
-			    ("\n**** Context Switch from TID %lX to TID %lX ****\n\n",
-			     (unsigned long) acpi_gbl_prev_thread_id,
-			     (unsigned long) thread_id);
+			    ("\n**** Context Switch from TID %X to TID %X ****\n\n",
+			     (unsigned)acpi_gbl_prev_thread_id, (unsigned)thread_id);
 		}
 
 		acpi_gbl_prev_thread_id = thread_id;
@@ -195,7 +194,7 @@ acpi_ut_debug_print(u32 requested_debug_level,
 	acpi_os_printf("%8s-%04ld ", module_name, line_number);
 
 	if (ACPI_LV_THREADS & acpi_dbg_level) {
-		acpi_os_printf("[%04lX] ", thread_id);
+		acpi_os_printf("[%04X] ", (unsigned)thread_id);
 	}
 
 	acpi_os_printf("[%02ld] %-22.22s: ",