From: Roland Dreier <rdreier@cisco.com>
Date: Thu, 26 Mar 2009 23:25:49 +0000 (-0700)
Subject: RDMA/nes: Fix mis-merge
X-Git-Tag: v2.6.30-rc1~650
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c757eb9f804782fb39d0ae2c1a88ffb9309138e;p=pandora-kernel.git

RDMA/nes: Fix mis-merge

When net-next and infiniband were merged upstream, each branch deleted
one of a pair of adjacent lines from nes_nic.c, but when Linus fixed the
conflict up, he brought back both of the lines.  Fix up to the intended
final tree state.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

Reading git-diff-tree failed