]> 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, 12 Dec 2013 23:50:05 +0000 (10:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Dec 2013 23:50:05 +0000 (10:50 +1100)
commit2d3f80e5bf269dff3e5485d39ce626745478874a
tree4ec24390379b166eacaa95ee85da3e01901e5bc6
parent13306f6e3251a2c4be36acf435d68de6b0617aef
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