Greg Kroah-Hartman becba85f0e Merge 4.0-rc3 into tty-testing ...

This resolves a merge issue in drivers/tty/serial/8250/8250_pci.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2015-03-09 07:08:37 +01:00

..

8250

Merge 4.0-rc3 into tty-testing

2015-03-09 07:08:37 +01:00

cpm_uart

Driver core patches for 3.19-rc1

2014-12-14 16:10:09 -08:00

jsm

serial: jsm: Fix unnecessary space before function ptr arguments

2014-11-25 17:06:38 -08:00

21285.c

…

68328serial.c

…

altera_jtaguart.c

serial: altera-juart: fix NULL device in log message

2015-01-09 14:28:17 -08:00

altera_uart.c

serial: altera-uart: fix NULL device in log message

2015-01-09 14:28:17 -08:00

amba-pl010.c

…

amba-pl011.c

drivers/tty: amba: defer DMA probe until the DMA channel is required.

2015-03-07 03:50:30 +01:00

apbuart.c

…

apbuart.h

…

ar933x_uart.c

serial: ar933x_uart: Fix off-by-one for checking valid alias id

2015-03-07 03:20:25 +01:00

arc_uart.c

…

atmel_serial.c

Merge 4.0-rc3 into tty-testing

2015-03-09 07:08:37 +01:00

bcm63xx_uart.c

tty: serial/bcm63xx_uart: fix sparse warning

2015-03-07 03:13:07 +01:00

bfin_sport_uart.c

tty: pr_warning->pr_warn and logging neatening

2014-11-25 17:06:38 -08:00

bfin_sport_uart.h

…

bfin_uart.c

Driver core patches for 3.19-rc1

2014-12-14 16:10:09 -08:00

clps711x.c

serial: clps711x: fail if mctrl_gpio_init fails

2015-03-07 03:15:03 +01:00

crisv10.c

…

crisv10.h

…

digicolor-usart.c

tty/serial: digicolor: remove sysrq reference

2015-02-02 10:11:25 -08:00

dz.c

…

dz.h

…

earlycon-arm-semihost.c

…

earlycon.c

serial: earlycon: Refactor parse_options into serial core

2015-03-07 03:55:07 +01:00

efm32-uart.c

…

etraxfs-uart.c

serial: driver for ETRAX FS UART

2015-02-07 18:43:16 +08:00

fsl_lpuart.c

tty: serial: fsl_lpuart: terminate DMA on buffer flush

2015-02-02 10:09:55 -08:00

icom.c

serial: icom: fix error return code

2014-11-25 17:06:39 -08:00

icom.h

…

ifx6x60.c

…

ifx6x60.h

…

imx.c

serial: imx: add support for half duplex rs485

2015-03-07 03:26:33 +01:00

ioc3_serial.c

…

ioc4_serial.c

…

ip22zilog.c

…

ip22zilog.h

…

Kconfig

x86, intel-mid: remove Intel MID specific serial support

2015-03-07 03:25:18 +01:00

kgdb_nmi.c

…

kgdboc.c

…

lantiq.c

Driver core patches for 3.19-rc1

2014-12-14 16:10:09 -08:00

lpc32xx_hs.c

…

m32r_sio_reg.h

…

m32r_sio.c

…

m32r_sio.h

…

Makefile

x86, intel-mid: remove Intel MID specific serial support

2015-03-07 03:25:18 +01:00

max310x.c

…

max3100.c

tty: max3100: use msecs_to_jiffies for time conversion

2015-03-07 03:13:08 +01:00

mcf.c

serial: mcf: fix no driver name in probe output

2015-01-09 14:06:57 -08:00

men_z135_uart.c

tty: serial: men_z135_uart: Fix driver for changes in hardware

2015-02-02 10:11:27 -08:00

meson_uart.c

…

mpc52xx_uart.c

…

mpsc.c

Driver core patches for 3.19-rc1

2014-12-14 16:10:09 -08:00

msm_serial_hs.c

More ACPI and power management updates for 3.19-rc1

2014-12-18 20:28:33 -08:00

msm_serial.c

tty: serial: msm_serial: Remove console unregistration from driver exit.

2015-02-02 10:11:25 -08:00

msm_serial.h

…

msm_smd_tty.c

…

mux.c

…

mxs-auart.c

serial: mxs-auart: properly handle mctrl_gpio failing

2015-03-07 03:15:03 +01:00

netx-serial.c

…

nwpserial.c

…

of_serial.c

Revert "tty/serial: of_serial: add DT alias ID handling"

2015-03-07 03:06:51 +01:00

omap-serial.c

serial: omap: Fix RTS handling

2015-02-02 10:11:28 -08:00

pch_uart.c

…

pmac_zilog.c

Driver core patches for 3.19-rc1

2014-12-14 16:10:09 -08:00

pmac_zilog.h

…

pnx8xxx_uart.c

Driver core patches for 3.19-rc1

2014-12-14 16:10:09 -08:00

pxa.c

Driver core patches for 3.19-rc1

2014-12-14 16:10:09 -08:00

rp2.c

…

sa1100.c

Driver core patches for 3.19-rc1

2014-12-14 16:10:09 -08:00

samsung.c

serial: samsung: earlycon support depends on CONFIG_SERIAL_SAMSUNG_CONSOLE

2015-02-02 11:11:00 -08:00

samsung.h

serial: samsung: add DMA support for RX

2015-01-09 14:25:39 -08:00

sb1250-duart.c

…

sc16is7xx.c

…

sccnxp.c

…

serial_core.c

serial: earlycon: Refactor parse_options into serial core

2015-03-07 03:55:07 +01:00

serial_ks8695.c

…

serial_mctrl_gpio.c

serial: mctrl-gpio: simplify init routine

2015-03-07 03:15:04 +01:00

serial_mctrl_gpio.h

…

serial_txx9.c

…

serial-tegra.c

serial: tegra: clean up tty-flag assignments

2014-11-25 17:06:39 -08:00

sh-sci.c

serial: sh-sci: Fix R-Car SCIF and HSCIF overrun handling

2015-02-02 10:11:26 -08:00

sh-sci.h

…

sirfsoc_uart.c

serial: sirf: rename marco to atlas7

2015-01-09 14:17:59 -08:00

sirfsoc_uart.h

serial: sirf: rename marco to atlas7

2015-01-09 14:17:59 -08:00

sn_console.c

…

sprd_serial.c

Merge 4.0-rc3 into tty-testing

2015-03-09 07:08:37 +01:00

st-asc.c

…

suncore.c

…

sunhv.c

…

sunsab.c

Driver core patches for 3.19-rc1

2014-12-14 16:10:09 -08:00

sunsab.h

…

sunsu.c

Driver core patches for 3.19-rc1

2014-12-14 16:10:09 -08:00

sunzilog.c

Driver core patches for 3.19-rc1

2014-12-14 16:10:09 -08:00

sunzilog.h

…

tilegx.c

…

timbuart.c

Driver core patches for 3.19-rc1

2014-12-14 16:10:09 -08:00

timbuart.h

…

uartlite.c

…

ucc_uart.c

…

vr41xx_siu.c

…

vt8500_serial.c

…

xilinx_uartps.c

tty: serial: xilinx_uartps: Use Macro for ttyPS0

2015-03-07 03:28:57 +01:00

zs.c

…

zs.h

…