d29b8a51a5
Merge commit '5109146f954d8cca39d34689bff2762e15bc6933' into gingerbread-plus-aosp * commit '5109146f954d8cca39d34689bff2762e15bc6933': Reconcile assembly-only macros in <machine/cpu-features.h>