Merge branch 'WiringPi-master'

Resolving merge conflicts from WIringPi/WiringPi:master

wiringPi/drcNet.c

@@ -76,12 +76,12 @@ static int remoteReadline (int fd, char *buf, int max)
 
 static char *getChallenge (int fd)
 {
-  static char buf [1024] ;
+  static char buf [512] ;
   int num ;
 
   for (;;)
   {
-    if ((num = remoteReadline (fd, buf, 1023)) < 0)
+    if ((num = remoteReadline (fd, buf, 511)) < 0)
       return NULL ;
     buf [num] = 0 ;
 

wiringPi/wiringPi.h

@@ -121,7 +121,7 @@
 #define	PI_MAKER_STADIUM	5
 
 extern const char *piModelNames    [21] ;
-extern const char *piRevisionNames [21] ;
+extern const char *piRevisionNames [16] ;
 extern const char *piMakerNames    [16] ;
 extern const int   piMemorySize    [ 8] ;