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)
commit77d4015ba1ce22987bbf41e6469fa94cd72cb8d7
tree982957514f2e4966c2a817c7615178c459e1fd3a
parentf2e5ddcc0d12f9c4c7b254358ad245c9dddce13b
parente93b7d748be887cd7639b113ba7d7ef792a7efb9
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>