aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorUrsula Braun <ubraun@linux.vnet.ibm.com>2009-04-23 06:37:16 -0700
committerDavid S. Miller <davem@davemloft.net>2009-04-23 06:37:16 -0700
commitd93fe1a144c1a4312972bedbefc2213aa8b88612 (patch)
tree5b79f04234ecc96245a95a1191d677d03d6955b3 /kernel
parent5802b140ed52957ad150eaf40239a95f5f45fbd3 (diff)
downloadkernel_samsung_crespo-d93fe1a144c1a4312972bedbefc2213aa8b88612.zip
kernel_samsung_crespo-d93fe1a144c1a4312972bedbefc2213aa8b88612.tar.gz
kernel_samsung_crespo-d93fe1a144c1a4312972bedbefc2213aa8b88612.tar.bz2
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>
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions