From: David S. Miller <davem@davemloft.net>
Date: Wed, 6 Aug 2014 02:09:19 +0000 (-0700)
Subject: sparc64: Fix up merge thinko.
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~148^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b6ff9df056b69a3b65708bfb9923af41146c8c8;p=pandora-kernel.git

sparc64: Fix up merge thinko.

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

Reading git-diff-tree failed