tree 255d570c57f70878ddafaee79b53afc24454f540
parent fac9199c7698481805dd9b1adaf89a2584719f4c
parent de2781d906f27be4df3e03a8e5041dcc1aeb281d
author Elliott Hughes <enh@google.com> 1372883956 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372883956 -0700

am de2781d9: Merge changes I01345c23,I3b57517c

* commit 'de2781d906f27be4df3e03a8e5041dcc1aeb281d':
  Include linux/termios.h from sys/ioctl.h.
  Update linux/types.h to linux 2.6.20.