Merge remote-tracking branch 'remotes/mpi/master' into wip-mc

Conflicts:
	src/ft2csv.c
	src/ftdump.c

1 files changed, 2 insertions, 2 deletions

diff --git a/src/ft2csv.c b/src/ft2csv.c
index ce44c7e..b75b284 100644
--- a/src/ft2csv.c
+++ b/src/ft2csv.c
@@ -37,7 +37,6 @@ static int only_cpu  = -1;
 
 static unsigned int complete   = 0;
 static unsigned int incomplete = 0;
-static unsigned int filtered   = 0;
 static unsigned int skipped    = 0;
 static unsigned int non_rt     = 0;
 static unsigned int interleaved = 0;
@@ -46,9 +45,9 @@ static unsigned int lvl_a_sched = 0;
 static unsigned int lvl_b_sched = 0;
 static unsigned int lvl_c_sched = 0;
 static unsigned int other_sched = 0;
+static unsigned int filtered = 0;
 
 #define CYCLES_PER_US 2128
-
 static unsigned long long threshold = CYCLES_PER_US * 10000; /* 10 ms == 10 full ticks */
 
 static struct timestamp* next(struct timestamp* start, struct timestamp* end,
@@ -428,5 +427,6 @@ int main(int argc, char** argv)
                 interleaved, lvl_a_sched, lvl_b_sched, lvl_c_sched,
                 other_sched);
 
+
         return 0;
 }