diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-23 16:21:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-23 16:21:16 -0700 |
| commit | 039a6f6a39d2aa30ee53afdb213ea6dd4482928b (patch) | |
| tree | 7ea0979b9a227039be3b9ced35b9a429a6974cab /net/bridge | |
| parent | 18f27383d9bdcb985cc39599e99917bdad101a60 (diff) | |
ucc_geth: Fix merge error.
I left a merge failure unresolved, noticed by Stephen
Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
0 files changed, 0 insertions, 0 deletions