Auto merge of #998 - canndrew:linux-socket-ioctls, r=alexcrichton

Add linux socket ioctl defs