From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 10 Oct 2008 04:56:16 +0000 (+1100)
Subject: Merge commit 'jk/jk-merge'
X-Git-Tag: v2.6.28-rc1~569^2~28
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bb3d55e2505d8de15b132a3f6a1d596c1e2a13ee;p=users%2Fjedix%2Flinux-maple.git

Merge commit 'jk/jk-merge'
---

bb3d55e2505d8de15b132a3f6a1d596c1e2a13ee