tree be6dda92f007a49ff12cc38c337a65b593d9fa32
parent ef0c8360065eba7f353f4ac866a1f6f86bf18cf4
parent e50e654bca8df8254c15849c793f9279adcb1182
author Andrew Jeffery <andrew@aj.id.au> 1554073103 +1030
committer Andrew Jeffery <andrew@aj.id.au> 1554073114 +1030

Merge commit 'e50e654bca8df8254c15849c793f9279adcb1182' into master

Commit e50e654bca8d ("Add --trace support (in blktrace format)") is a broken
version of commit ef0c8360065e ("Add --trace support (in blktrace
format)") that appears in master's linear history. Merging e50e654bca8d
preserves the ability to bisect the openbmc/openbmc respository.

The merge was performed as below, which discards any changes performed
in e50e654bca8d:

> $ git merge -s ours e50e654bca8df8254c15849c793f9279adcb1182

Change-Id: I134be5a54303a561ed3ef21813b1e220c0dbd0a6
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>