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)

Trivial merge