tree e949e0efd019d6f932537aba762792b07a84351c
parent a0a55682b83fd5f012afadcf415b030d7424ae68
parent 79a94c3538bda6869d7bb150b5e02dd3a72314dd
author Russell King <rmk+kernel@arm.linux.org.uk> 1287522396 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1287522396 +0100

Merge branch 'devel-stable' into devel