]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'renesas/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 06:26:19 +0000 (16:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 06:26:19 +0000 (16:26 +1000)
commitd3f1f7b77ff5c893fa5cdfba6719a28b4b132bc1
tree791c8622afd4d411618ea59df934e73904f91a3d
parente22d05f5f976b47c08f2e51e5d63a8f78afe6e6e
parent4e8ee671f3dc6d7fc4c6a2903a4920f61701d208
Merge remote-tracking branch 'renesas/next'

Conflicts:
arch/arm/mach-shmobile/board-bockw.c
arch/arm/mach-shmobile/clock-r8a7778.c
arch/arm/mach-shmobile/include/mach/r8a7778.h
include/linux/serial_sci.h
include/uapi/linux/serial_core.h
arch/arm/Kconfig
arch/arm/mach-shmobile/Kconfig
drivers/tty/serial/sh-sci.c
include/linux/serial_sci.h
include/uapi/linux/serial_core.h