Merge commit 'linus/master' into merge-linus

Conflicts:

	arch/x86/kvm/i8254.c

1 files changed, 5 insertions, 5 deletions

diff --git a/arch/x86/kernel/bios_uv.c b/arch/x86/kernel/bios_uv.c
index c639bd55391c..fdd585f9c53d 100644
--- a/arch/x86/kernel/bios_uv.c
+++ b/arch/x86/kernel/bios_uv.c
@@ -25,11 +25,11 @@ x86_bios_strerror(long status)
 {
         const char *str;
         switch (status) {
-        case  0: str = "Call completed without error"; break;
-        case -1: str = "Not implemented"; break;
-        case -2: str = "Invalid argument"; break;
-        case -3: str = "Call completed with error"; break;
-        default: str = "Unknown BIOS status code"; break;
+        case  0: str = "Call completed without error";  break;
+        case -1: str = "Not implemented";               break;
+        case -2: str = "Invalid argument";              break;
+        case -3: str = "Call completed with error";     break;
+        default: str = "Unknown BIOS status code";      break;
         }
         return str;
 }