From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 12 Jan 2006 18:21:22 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
X-Git-Tag: v2.6.16-rc1~184
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45bfe98bd790b5ded00462cd582effcfb42263cc;p=linux-2.6

Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

Fix up delete/modify conflict of arch/ppc/kernel/process.c by hand (it's
gone, gone, gone).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

45bfe98bd790b5ded00462cd582effcfb42263cc