tree 843a4a48892d3881ad9bff60ea4ec05c9138394a
parent a6fa57d23f8a322aab22efd03689826e4a107f64
parent 19d00adb2bcbf1a20d4c8d0e9d07651d0e959153
author Elliott Hughes <enh@google.com> 1427996439 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427996439 +0000

am 19d00adb: am 27a158be: Merge "toolbox: ioctl: fix signedness on ioctl_nr"

* commit '19d00adb2bcbf1a20d4c8d0e9d07651d0e959153':
  toolbox: ioctl: fix signedness on ioctl_nr