tree 8dc7beb630070de7db38581631e12e1bba2a31aa
parent ebc8ce1de68a83d772106af98c7cb98150bb5662
parent f936ef1a9f1f77985ca1fae35c1b0dc78e1510c0
author Elliott Hughes <enh@google.com> 1372883848 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1372883848 +0000

Merge changes I01345c23,I3b57517c

* changes:
  Include linux/termios.h from sys/ioctl.h.
  Update linux/types.h to linux 2.6.20.