| commit | 039a6f6a39d2aa30ee53afdb213ea6dd4482928b | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Mar 23 16:21:16 2009 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Mon Mar 23 16:21:16 2009 -0700 |
| tree | 7ea0979b9a227039be3b9ced35b9a429a6974cab | |
| 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>