Commit 1f75ee86 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am a8b954c5: am de2781d9: Merge changes I01345c23,I3b57517c 

* commit 'a8b954c5':
  Include linux/termios.h from sys/ioctl.h.
  Update linux/types.h to linux 2.6.20.
parents be438a4c a8b954c5
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment