From: Paul Mackerras <paulus@samba.org>
Date: Fri, 10 Feb 2006 05:51:29 +0000 (+1100)
Subject: Merge ../powerpc-merge
X-Git-Tag: v2.6.17-rc1~1117^2~41
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6d93856cb90eeb07062ad938bd26f554bf1b9b9;p=linux-2.6

Merge ../powerpc-merge
---

d6d93856cb90eeb07062ad938bd26f554bf1b9b9