tree 7ad6e825427a15c5ec0fc15540abc0429d7f4bce
parent 2741ecb4ce5c2d430b5c44b0a169038338c21df5
parent eed18b5fa4d297c681b00144e8c6942dd35d39a7
author Russell King <rmk+kernel@arm.linux.org.uk> 1267135838 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1267135838 +0000

Merge branches 'clks' and 'pnx' into devel