From: Arnd Bergmann Date: Mon, 30 Apr 2012 21:31:00 +0000 (+0200) Subject: Merge branch 'spear/dt' into next/dt X-Git-Tag: firefly_0821_release~3680^2~2832^2~6 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6875dc6521be57f695845d13469109a388029e43;p=firefly-linux-kernel-4.4.55.git Merge branch 'spear/dt' into next/dt * spear/dt: ARM: SPEAr3xx: Correct keyboard data passed from DT Signed-off-by: Arnd Bergmann [olof: rebuilt branch due to drop of an early merge] Signed-off-by: Olof Johansson --- 6875dc6521be57f695845d13469109a388029e43