]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sh/sh-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 00:20:40 +0000 (11:20 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 00:20:40 +0000 (11:20 +1100)
commit6cd9b07c1b7067d0f76cfd594acf3f793974fed5
treec55adeccbf622248026f10a807d49b4ac7440e3b
parentbab855e3b4b2be7957613bee73de6a82d70a3b1d
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