From: Elliott Hughes <enh@google.com>
Date: Wed, 3 Jul 2013 20:37:28 +0000 (+0000)
Subject: Merge changes I01345c23,I3b57517c
X-Git-Tag: android-x86-4.4-r1~19^2~44^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=de2781d9;p=android-x86%2Fbionic.git

Merge changes I01345c23,I3b57517c

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

de2781d906f27be4df3e03a8e5041dcc1aeb281d