]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sh/sh-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 00:29:10 +0000 (10:29 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 00:29:10 +0000 (10:29 +1000)
commit4513cd48136029d862870f674ae60ec359a976c4
tree9e043859d8972046f619b815675bc4b93bd42396
parent3910d3a3ceb2b48e5c68ff5a904aa9964de301e3
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