From: Paul Mackerras <paulus@samba.org>
Date: Wed, 2 Nov 2005 04:14:44 +0000 (+1100)
Subject: Merge git://oak/home/sfr/kernels/iseries/work
X-Git-Tag: v2.6.15-rc1~726^2~3^2~20
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b5ca71a58bacb5f1d563a0fe51525b6006618e82;p=users%2Fjedix%2Flinux-maple.git

Merge git://oak/home/sfr/kernels/iseries/work
---

b5ca71a58bacb5f1d563a0fe51525b6006618e82