tree baa3ba406135247eeb9cdf495448b5db8eea2f0b
parent 8df6516864462cb7a6f87d5a46df68fb0faebbb5
parent b3773301c4290f054aa2aa5379e59a1bf4f78bdf
author Russell King <rmk+kernel@arm.linux.org.uk> 1288294753 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1288294753 +0100

Merge branch 'devel-stable' into devel