am d322d163: am ae66946b: Merge "fix a race in SF buffer management" into gingerbread

Merge commit 'd322d16323176ddd5fef3383798176f64d0078c8'

* commit 'd322d16323176ddd5fef3383798176f64d0078c8':
  fix a race in SF buffer management