tree b1f8ee310e96826560740ca6590291a283c54b51
parent aeedec3f4d02ac45d90f3520d184742982801949
parent 9b66717d9e4dd32e61a03f572d4eaebbfb4ee6c3
author Dmitry Shmidt <dimitrysh@google.com> 1260736333 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260736333 -0800

am 9b66717d: bcm4329: sync with kernel tree (b/2249878)   1798b1b3: Fix wl_iw_set_pmksa() functionality   05d8e87f: Set 2 retries to config registers access   9dde2be3: Stop transmit queue in case of firmware failure   d1d35073: Get IRQ type from platform data

Merge commit '9b66717d9e4dd32e61a03f572d4eaebbfb4ee6c3' into eclair-mr2-plus-aosp

* commit '9b66717d9e4dd32e61a03f572d4eaebbfb4ee6c3':
  bcm4329: sync with kernel tree (b/2249878)