Merge branch 'master' into nomerge2

This commit is contained in:
Ivan Skytte Jørgensen
2016-09-20 15:29:58 +02:00

@ -225,3 +225,20 @@
drd:ConflictingAccess
fun:_Z38gettimeofdayInMillisecondsGlobalNoCorev
}
{
settimeofdayinmilliseconds_conflict
drd:ConflictingAccess
fun:_Z32settimeofdayInMillisecondsGloball
}
{
<insert_a_suppression_name_here>
drd:ConflictingAccess
fun:_ZN4File10calledOpenEv
fun:_ZN7BigFile5getfdEib
}
{
<insert_a_suppression_name_here>
drd:ConflictingAccess
fun:_Z15getCloseCount_ri
fun:_ZL18readwriteWrapper_rPv
}