tree a9eee86fb9c60f104e1d08eb238370f0e69daf34
parent 891bd83f4bd96fe7a263319abe1a6f2affb151d6
parent 0b9822bf77b21d7d988be84480f3b2212b1f98ba
author David 'Digit' Turner <digit@google.com> 1310515130 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1310515130 -0700

am 0b9822bf: am 17a32d89: am dd8b731f: merge intel x86 patches into gingerbread branch

* commit '0b9822bf77b21d7d988be84480f3b2212b1f98ba':
  Add defines for CAIF support
  Sync up line disciplines with ARM