projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 18f2738) | patch
ucc_geth: Fix merge error.
authorDavid S. Miller <davem@davemloft.net>
Mon, 23 Mar 2009 23:21:16 +0000 (16:21 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 23 Mar 2009 23:21:16 +0000 (16:21 -0700)
commit039a6f6a39d2aa30ee53afdb213ea6dd4482928b
tree7ea0979b9a227039be3b9ced35b9a429a6974cabtree | snapshot
parent18f27383d9bdcb985cc39599e99917bdad101a60commit | 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>
drivers/net/ucc_geth.c diff | blob | history
John Crispins staging tree