From: David S. Miller <davem@davemloft.net>
Date: Sun, 20 Jul 2008 17:18:44 +0000 (-0700)
Subject: iucv: Fix bad merging.
X-Git-Tag: v2.6.27-rc1~969^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb65a7c091529bfffb1262515252c0d0f6241c5c;p=pandora-kernel.git

iucv: Fix bad merging.

Noticed by Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed