tree ff7d9f5c0e0ddf14230ba28f28ef69a2c0a0debf
parent 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204
parent 2192482ee5ce5d5d4a6cec0c351b2d3a744606eb
author Russell King <rmk+kernel@arm.linux.org.uk> 1281359369 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1281359369 +0100

Merge branch 'devel-stable' into devel