am bdb2a905: am d08fb687: am e5783e58: am 2abf0f24: Fix a race condition that could cause lockup

* commit 'bdb2a90570b6fcdcb85d010070f77f7cea61e41a':
  Fix a race condition that could cause lockup