]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sh/sh-latest'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:32:58 +0000 (14:32 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:32:58 +0000 (14:32 +0200)
commita39d16ab3f22d902ed08a3708496a96500f36a5e
tree9e7780a982ee033eb8a8df8706814b3e90f8dc55
parent48274de1809f10dc167bf7dfd8517df6abb04374
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