qemu: Remove stray conflict markers that were committed by accident

Signed-off-by: Diego Biurrun <diego@biurrun.de>
s2e.h: documentation typo and grammar fixes

Signed-off-by: Diego Biurrun <diego@biurrun.de>
s2e.h: cosmetics: coding style consistency fixes

Signed-off-by: Diego Biurrun <diego@biurrun.de>
s2e.h: Fix parameterless function declarations

This fixes several warnings of the sort
s2e.h:61:19: warning: function declaration isn’t a prototype [-Wstrict-prototypes]

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Fix typos pointed out by codespell

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Fix grammar error in license boilerplate

Signed-off-by: Diego Biurrun <diego@biurrun.de>
init_env: Fix duplicated line and grammar in help output

Signed-off-by: Diego Biurrun <diego@biurrun.de>
docs: Fix error condition in minimal example test program

The program was checking for a premature null byte in a string supposed
to consist of two characters.  Since fgets() places the terminating newline
in the string, this check would fail when only one character was provided.

Signed-off-by: Diego Biurrun <diego@biurrun.de>