From: Arnd Bergmann Date: Thu, 24 Apr 2014 13:33:31 +0000 (+0200) Subject: Merge tag 'v3.15-rockchip-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: MMI-PSA29.97-13-9~12230^2~19 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=59209c9a34f1e57922055110a476f9bc56c3fc99;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge tag 'v3.15-rockchip-fixes1' of git://git./linux/kernel/git/mmind/linux-rockchip into fixes Fixing uart-rx pull settings and a copy'n'paste error in a smp message * tag 'v3.15-rockchip-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: rockchip: fix copy'n'paste error in smp error messages ARM: rockchip: rk3188: enable pull-ups on UART RX pins Signed-off-by: Arnd Bergmann --- 59209c9a34f1e57922055110a476f9bc56c3fc99