tree 13ca50e109a23bcc5e1622ca658000cb85668d1e
parent e8765afe54b72b85ffe2b60683710ff450a92912
parent 667f390bee987d45351402e42008c52cdfb77d76
parent a35d4e58737116fd4126c240a1faeb735839435e
parent 4d5336d50a7b4992c90729c27dae027a3426c48c
parent 041f10d46f97c87f8ae1cdb4117682214732cc45
parent be20902ba67de70b38c995903321f4152dee57b7
author Russell King <rmk+kernel@arm.linux.org.uk> 1306170310 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1306170310 +0100

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate