Merge branch 'upstream-fixes' into upstream

Conflicts:

	drivers/scsi/sata_sil24.c

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c
index 3a0ac38e978b..90912aaca7aa 100644
--- a/arch/um/os-Linux/main.c
+++ b/arch/um/os-Linux/main.c
@@ -59,7 +59,7 @@ static __init void do_uml_initcalls(void)
         initcall_t *call;
 
         call = &__uml_initcall_start;
-        while (call < &__uml_initcall_end){;
+        while (call < &__uml_initcall_end){
                 (*call)();
                 call++;
         }