| commit | bdc514700d9f766f5a44a95bb80dab15846bd1c4 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Sep 26 15:19:22 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 26 15:19:22 2012 -0700 |
| tree | f46f0d1a14db783c6c4254124cf6bfe053b36908 | |
| parent | 0792223a8ab0f9ecb5fc8fe471dbb7890bb6c2cc [diff] | |
| parent | 2c29bcf77f0d7dd7fce284ac0c17ff12663413d0 [diff] |
am 2c29bcf7: am 827a2604: Merge "Replace __unused in kernel headers with __linux_unused to avoid conflicts with __unused macro in sys/cdefs.h" * commit '2c29bcf77f0d7dd7fce284ac0c17ff12663413d0': Replace __unused in kernel headers with __linux_unused to avoid conflicts with __unused macro in sys/cdefs.h