]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sh/sh-latest'
authorThierry Reding <treding@nvidia.com>
Mon, 21 Oct 2013 10:43:36 +0000 (12:43 +0200)
committerThierry Reding <treding@nvidia.com>
Mon, 21 Oct 2013 10:43:36 +0000 (12:43 +0200)
commit2f019e8c534947326637de151fac05957074283b
treea6fa3516ce9261121fdced2d3bb82a655b09b53a
parentd67c35d2742d51dccee02ebdbaadc4ecdfa3d932
parent37284bd93103ae36b5ea274a985d688fb16f7a38
Merge remote-tracking branch 'sh/sh-latest'

Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile
drivers/tty/serial/sh-sci.c
include/linux/serial_sci.h
arch/sh/kernel/cpu/sh2a/Makefile
drivers/tty/serial/sh-sci.c
include/linux/serial_sci.h