2389b27216 contains a merge bug; fix it. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2389b27216