8a5d78c Merge branch 'master' into f20

Merged and Committed by Jiri Pirko 10 years ago
    Merge branch 'master' into f20
    
    Signed-off-by: Jiri Pirko <jiri@resnulli.us>
    
    Conflicts:
    	libndp.spec
    
        
file modified
+1 -0
file modified
+11 -2
file modified
+1 -1