projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5802b14) | patch
af_iucv: Fix merge.
authorUrsula Braun <ubraun@linux.vnet.ibm.com>
Thu, 23 Apr 2009 13:37:16 +0000 (06:37 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 23 Apr 2009 13:37:16 +0000 (06:37 -0700)
commitd93fe1a144c1a4312972bedbefc2213aa8b88612
tree5b79f04234ecc96245a95a1191d677d03d6955b3tree | snapshot
parent5802b140ed52957ad150eaf40239a95f5f45fbd3commit | diff
af_iucv: Fix merge.

From: Ursula Braun <ubraun@linux.vnet.ibm.com>

net/iucv/af_iucv.c in net-next-2.6 is almost correct. 4 lines should
still be deleted. These are the remaining changes:

Signed-off-by: David S. Miller <davem@davemloft.net>
net/iucv/af_iucv.c diff | blob | history
John Crispins staging tree