From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 2 Jul 2010 04:05:10 +0000 (+0900)
Subject: Merge branches 'sh/highmem' and 'sh/stable-updates'
X-Git-Tag: v2.6.37-rc1~136^2~99
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=12462d77ec78be9fb033580b7b64ddf9d0fee44b;p=users%2Fhch%2Fblock.git

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

12462d77ec78be9fb033580b7b64ddf9d0fee44b