tree 54313e535097d76ec6ae250646e29347e4809da0
parent 82775ae0acf7cac647c057c80fbcc7f13d0554d3
parent 5109146f954d8cca39d34689bff2762e15bc6933
author Jean-Baptiste Queru <jbq@google.com> 1287526917 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287526917 -0700

am 5109146f: Merge "Reconcile assembly-only macros in <machine/cpu-features.h>"

Merge commit '5109146f954d8cca39d34689bff2762e15bc6933' into gingerbread-plus-aosp

* commit '5109146f954d8cca39d34689bff2762e15bc6933':
  Reconcile assembly-only macros in <machine/cpu-features.h>