[ARM] Merge AT91 and devel branches

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>