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

am a8b954c5: am de2781d9: Merge changes I01345c23,I3b57517c

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

1f75ee860664b33eec6caf9a717c79087185b01d