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)
* changes:
  Include linux/termios.h from sys/ioctl.h.
  Update linux/types.h to linux 2.6.20.


Trivial merge