Merge branch 'ufo_fixes'
authorDavid S. Miller <davem@davemloft.net>
Sat, 19 Oct 2013 23:21:24 +0000 (19:21 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 19 Oct 2013 23:21:24 +0000 (19:21 -0400)
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>

Trivial merge