[uhd/f21: 2/2] Merge remote-tracking branch 'origin/master' into f21

[Jaroslav Škarvada]

commit 03767ce9f7f62209c2a9f0f32c172c14b4d9b6f8
Merge: 9b20437 02fea4c
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Mon Sep 1 17:13:11 2014 +0200

    Merge remote-tracking branch 'origin/master' into f21

 sources                            |    4 +-
 uhd-3.5.3-no-neon.patch            |   29 ------------
 uhd-3.7.2-uhd-dump-libs.patch      |   22 +++++++++
 uhd-3.7.2-wireshark-1.12-fix.patch |   12 +++++
 uhd.spec                           |   86 ++++++++++++++++++++++++++++++------
 5 files changed, 108 insertions(+), 45 deletions(-)
---