tree bfece31a51ceec2793cb69b3ac1c936e0652bcbc
parent cc780af5aca00d573eae0e926e1d4cf1439b580e
parent ae1d3b974e091b5fc9008bd41bcbdaac68110b62
parent 81479c246c07b703aeb4bf54933b7d928cb5b717
author Russell King <rmk+kernel@arm.linux.org.uk> 1306533597 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1306533597 +0100

Merge branches 'devel', 'devel-stable' and 'fixes' into for-linus