| commit | 77d4015ba1ce22987bbf41e6469fa94cd72cb8d7 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat Oct 19 19:21:24 2013 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Sat Oct 19 19:21:24 2013 -0400 |
| tree | 982957514f2e4966c2a817c7615178c459e1fd3a | |
| parent | f2e5ddcc0d12f9c4c7b254358ad245c9dddce13b [diff] | |
| parent | e93b7d748be887cd7639b113ba7d7ef792a7efb9 [diff] |
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>