| commit | 59209c9a34f1e57922055110a476f9bc56c3fc99 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Thu Apr 24 15:33:31 2014 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Thu Apr 24 15:33:31 2014 +0200 |
| tree | 337923f7f77c47fdfca014833a0a1b76ea92a5a9 | |
| parent | 9dbb7e24514f33144e7bdbe66aae84adc04b9cc8 [diff] | |
| parent | 5c4348c1f959234664e4667f428cf82b3b8a7c2c [diff] |
Merge tag 'v3.15-rockchip-fixes1' of git://git.kernel.org/pub/scm/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 <arnd@arndb.de>