]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sh/sh-latest'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:29:21 +0000 (11:29 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:29:21 +0000 (11:29 +0200)
commit84afd914192cd0aa11073b472041ee5668034026
treef7e056bf8c1af280b2355ec0fd5c6585162edcce
parentc8c0369fe0e7b6ff77d7476eb0458748fefeaad9
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