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)
commit305edadbfbc46f1d194d27e93e4237284b95fbb0
tree6c1fd0318721ab4b9e06cd1794903a05df97086c
parentb0af8dfdd67699e25083478c63eedef2e72ebd85
parent2ba564b90f4c53d7a25cdcf12c6fa15028db7bc9
Merge branch 'arm/proc-macros' of git://git.linaro.org/people/dmart/linux-2.6-arm into for-rmk