]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fbee155) | 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)
commitd35a552435ac30891131eccecc8d46e1d9c5ce95
tree7ea0979b9a227039be3b9ced35b9a429a6974cabtree | snapshot
parentfbee1558e60ae73d40ccadea034ff939fc44fd6ecommit | 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
Linux Kernel Source Tree.