From: David S. Miller <davem@davemloft.net>
Date: Sat, 19 Oct 2013 23:21:24 +0000 (-0400)
Subject: Merge branch 'ufo_fixes'
X-Git-Tag: firefly_0821_release~176^2~5117^2~10
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=77d4015ba1ce22987bbf41e6469fa94cd72cb8d7;p=firefly-linux-kernel-4.4.55.git

Merge branch 'ufo_fixes'

Jiri Pirko says:

====================
UFO fixes

Couple of patches fixing UFO functionality in different situations.

v1->v2:
- minor if{}else{} coding style adjustment suggested by Sergei Shtylyov
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

77d4015ba1ce22987bbf41e6469fa94cd72cb8d7