[libndp/f20: 4/4] Merge branch 'master' into f20

[Jiří Pírko]

commit 8a5d78c10beeadef062ae59f06a1a0374a7da452
Merge: 1c4895f 562fae8
Author: Jiri Pirko <jiri at resnulli.us>
Date:   Tue Oct 15 14:54:35 2013 +0200

    Merge branch 'master' into f20
    
    Signed-off-by: Jiri Pirko <jiri at resnulli.us>
    
    Conflicts:
    	libndp.spec

 .gitignore                            |    1 +
 0001-ndptool-fix-v-argument.patch     |   27 ---------------------------
 0002-fix-cflags-path-in-pc-file.patch |   23 -----------------------
 libndp.spec                           |   13 +++++++++++--
 sources                               |    2 +-
 5 files changed, 13 insertions(+), 53 deletions(-)
---