git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5802b14)
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)
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 patch | blob | history

diff --cc net/iucv/af_iucv.c
Simple merge
Pandora Kernel Repository