| commit | 1f75ee860664b33eec6caf9a717c79087185b01d | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Jul 03 13:45:45 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 03 13:45:45 2013 -0700 |
| tree | 9c990abc0f9986c8a56254ec9d87558c5710ce15 | |
| parent | be438a4c40a1e1809f5e9238c22618703a7b4506 [diff] | |
| parent | a8b954c51edd9ec8c09a5d1dccacaadf5869d78a [diff] |
am a8b954c5: am de2781d9: Merge changes I01345c23,I3b57517c * commit 'a8b954c51edd9ec8c09a5d1dccacaadf5869d78a': Include linux/termios.h from sys/ioctl.h. Update linux/types.h to linux 2.6.20.