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