Merge branch 'arm/proc-macros' of git://git.linaro.org/people/dmart/linux-2.6-arm...
authorWill Deacon <will.deacon@arm.com>
Thu, 7 Jul 2011 18:19:53 +0000 (19:19 +0100)
committerWill Deacon <will.deacon@arm.com>
Thu, 7 Jul 2011 18:19:53 +0000 (19:19 +0100)

Trivial merge