OSDN Git Service

Merge changes I01345c23,I3b57517c
authorElliott Hughes <enh@google.com>
Wed, 3 Jul 2013 20:37:28 +0000 (20:37 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 3 Jul 2013 20:37:28 +0000 (20:37 +0000)
commitde2781d906f27be4df3e03a8e5041dcc1aeb281d
tree8dc7beb630070de7db38581631e12e1bba2a31aa
parentebc8ce1de68a83d772106af98c7cb98150bb5662
parentf936ef1a9f1f77985ca1fae35c1b0dc78e1510c0
Merge changes I01345c23,I3b57517c

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