From: Nick Piggin <npiggin@suse.de>
Date: Thu, 23 Mar 2006 06:48:16 +0000 (+0100)
Subject: [PATCH] sparc64: fix set_page_count merge clash
X-Git-Tag: v2.6.17-rc1~1116
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcab1e51796d8bcd1a7969ff52bd904d38748e00;p=pandora-kernel.git

[PATCH] sparc64: fix set_page_count merge clash

Merge clash will have broken sparc64. Synch up its online_page
implementation with powerpc, which was identical until the
set_page_count removal.

Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

Reading git-diff-tree failed