From: Will Deacon <will.deacon@arm.com>
Date: Thu, 7 Jul 2011 18:19:53 +0000 (+0100)
Subject: Merge branch 'arm/proc-macros' of git://git.linaro.org/people/dmart/linux-2.6-arm... 
X-Git-Tag: v3.1-rc1~258^2^2~3^2~11
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=305edadbfbc46f1d194d27e93e4237284b95fbb0;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'arm/proc-macros' of git://git.linaro.org/people/dmart/linux-2.6-arm into for-rmk
---

305edadbfbc46f1d194d27e93e4237284b95fbb0