Merge branch 'master' into devop_socket

Conflicts:
	libctru/source/services/soc/soc_ioctl.c

diff --cc libctru/source/services/soc/soc_ioctl.c
index b6f71179b2949f279fd8df7ed182278d2b3c8df5,97fb5cbb159896ad7a0b7d89889f33370fb91d34..ba43a8c31913206a40c416c425855d7e3eefbc2e
--- 1/libctru/source/services/soc/soc_ioctl.c
--- 2/libctru/source/services/soc/soc_ioctl.c
+++ b/libctru/source/services/soc/soc_ioctl.c
@@@ -25,7 -25,8 +25,7 @@@ int ioctl(int sockfd, int request, ...
  
                if(value == NULL) {
                        errno = EFAULT;
-                       ret = -1;
 -                      va_end(ap);
+                       return -1;
                }
  
                flags = fcntl(sockfd, F_GETFL, 0);