]> 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, 19 Jul 2013 00:12:04 +0000 (10:12 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Jul 2013 00:12:04 +0000 (10:12 +1000)
commite9c5c65311634b51e233a31521d1b0bd74c47f99
treefab2ecbdd052d36c8928c1811aa7425665f43934
parentf8f508d5beda5a2f35534519d1f4d2858d5e7479
parent37284bd93103ae36b5ea274a985d688fb16f7a38
Merge remote-tracking branch 'sh/sh-latest'

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