tree 3d5432eff034a3b9cfdc98b37e245abe5695342d
parent a62c80e559809e6c7851ec04d30575e85ad6f6ed
parent 0aec63e67c69545ca757a73a66f5dcf05fa484bf
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1136644805 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1136644805 +0000

Merge with Linus' kernel.