am 642358b2: bcm4329: Fix add_timer race conditions (b/2249878)

Merge commit '642358b2ff5709acd916d3a5f97eb306641f3d96' into eclair-mr2-plus-aosp

* commit '642358b2ff5709acd916d3a5f97eb306641f3d96':
  bcm4329: Fix add_timer race conditions (b/2249878)
tree: b8526041119c8887e2e6a897453188f7eb11c642
  1. bcm4329/
  2. .gitignore