From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 8 Sep 2009 07:27:31 +0000 (+0900)
Subject: Merge branches 'sh/smp' and 'sh/stable-updates'
X-Git-Tag: v2.6.32-rc1~640^2~25
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e7a963ef20cabde53d0e609737764ddc65f4605a;p=users%2Fjedix%2Flinux-maple.git

Merge branches 'sh/smp' and 'sh/stable-updates'
---

e7a963ef20cabde53d0e609737764ddc65f4605a