projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9dbb7e2 5c4348c)
Merge tag 'v3.15-rockchip-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Thu, 24 Apr 2014 13:33:31 +0000 (15:33 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 24 Apr 2014 13:33:31 +0000 (15:33 +0200)
commit59209c9a34f1e57922055110a476f9bc56c3fc99
tree337923f7f77c47fdfca014833a0a1b76ea92a5a9tree | snapshot (tar.gz zip)
parent9dbb7e24514f33144e7bdbe66aae84adc04b9cc8commit | diff
parent5c4348c1f959234664e4667f428cf82b3b8a7c2ccommit | diff
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 <arnd@arndb.de>
Motorola kernel-slsi