Merge branch 'ioctl-test'
authorNikolaus Rath <Nikolaus@rath.org>
Fri, 13 May 2016 20:13:18 +0000 (13:13 -0700)
committerNikolaus Rath <Nikolaus@rath.org>
Fri, 13 May 2016 20:13:18 +0000 (13:13 -0700)
commit6682914d237890fceda98f25f9d5582b7ebc86b8
tree5753b443fdf45b51fc25df4008bf165288b1e30b
parent842b59b996e3db5f92011c269649ca29f144d35e
parentd516c72aaff077dc9f5a56af8023849dd54e1aa3
Merge branch 'ioctl-test'