author | Elliott Hughes <enh@google.com> | |
Sat, 12 Jul 2014 02:06:38 +0000 (02:06 +0000) | ||
committer | Android Git Automerger <android-git-automerger@android.com> | |
Sat, 12 Jul 2014 02:06:38 +0000 (02:06 +0000) |
* commit '0594b9ddded7d832b786c209dd7cd4e26ee32eb8':
EM_ARM and EM_AARCH64 are now in the uapi header.
EM_ARM and EM_AARCH64 are now in the uapi header.
Trivial merge