Merge branch 'unstable' into rettichschnidi

diff --git a/README.asciidoc b/README.asciidoc
index 0d878bc..133c13b 100644 (file)
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -46,7 +46,7 @@ manually with the command:
 
 Examples of devices based on AM7XXX are:
 
-  - Acer Series C pico projectors (C20 C110 C112):
+  - Acer Series C pico projectors (C20, C110, C112):
       * http://www.acer.it/ac/it/IT/content/models/projector-c
       * http://support.acer.com/product/default.aspx?modelId=3888
     

diff --git a/src/am7xxx.c b/src/am7xxx.c
index a840589..67718db 100644 (file)
--- a/src/am7xxx.c
+++ b/src/am7xxx.c
@@ -244,6 +244,7 @@ static void debug_dump_header(am7xxx_context *ctx, struct am7xxx_header *h)
        (void)ctx;
        (void)h;
 }
+
 static void trace_dump_buffer(am7xxx_context *ctx, const char *message,
                              uint8_t *buffer, unsigned int len)
 {