]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sh/sh-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 19 Sep 2013 00:40:42 +0000 (10:40 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 19 Sep 2013 00:40:42 +0000 (10:40 +1000)
commite9cb4a7e5f66a9cfc938b8ba06e36fc99c2049a4
tree24eb403856d40eda09d3f975181041ad365e811b
parente1b5936ee8b35fdf14e03208d698bc09d95f3213
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