[iproute/f19: 15/15] Merge branch 'master' into f19

[Petr Šabata]

commit 4433db644d5754f565e4ea7af74fd69b9387c086
Merge: 76033fc 268d422
Author: Petr Šabata <contyk at redhat.com>
Date:   Thu Feb 27 22:10:39 2014 +0100

    Merge branch 'master' into f19
    
    Conflicts:
    	iproute.spec

 .gitignore                                         |    3 +
 iproute.spec                                       |   95 +++++++++++++-------
 iproute2-2.6.25-segfault.patch                     |   21 -----
 iproute2-2.6.31-tc_modules.patch                   |   12 ---
 ...ptflags.patch => iproute2-3.11.0-optflags.patch |    4 +-
 iproute2-3.11.0-rtt.patch                          |   31 +++++++
 iproute2-3.11.0-tc-ok.patch                        |   91 +++++++++++++++++++
 ... => iproute2-3.12.0-lnstat-dump-to-stdout.patch |   10 +-
 iproute2-3.12.0-lnstat-interval.patch              |   34 +++++++
 iproute2-3.4.0-sharepath.patch                     |   24 -----
 iproute2-3.8.0-unused-result.patch                 |   13 ---
 man-pages.patch                                    |   11 ---
 sources                                            |    2 +-
 13 files changed, 229 insertions(+), 122 deletions(-)
---