From: Peter Maydell Date: Tue, 27 Mar 2018 14:23:38 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/xtensa/tags/20180326-xtensa' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=62d0289662746585239fbbf6a8d548f37f5fe6a8;p=qemu.git Merge remote-tracking branch 'remotes/xtensa/tags/20180326-xtensa' into staging target/xtensa fixes for 2.12: - add .inc. to non-top level source file names under target/xtensa; - fix #include in the import_core.sh script; - remove stray linux-user/xtensa/syscall.h; - fix timers test. # gpg: Signature made Mon 26 Mar 2018 22:40:20 BST # gpg: using RSA key 51F9CC91F83FA044 # gpg: Good signature from "Max Filippov " # gpg: aka "Max Filippov " # gpg: aka "Max Filippov " # Primary key fingerprint: 2B67 854B 98E5 327D CDEB 17D8 51F9 CC91 F83F A044 * remotes/xtensa/tags/20180326-xtensa: target/xtensa: fix timers test linux-user/xtensa: remove stray syscall.h target/xtensa/import_core.sh: fix #include target/xtensa: add .inc. to non-top level source file names Signed-off-by: Peter Maydell --- 62d0289662746585239fbbf6a8d548f37f5fe6a8