Linus Torvalds 0e65ae099c Merge tag 'ia64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux ...

Pull miscellaneous Itanium patches from Tony Luck.

The conflicts in arch/ia64/hp/sim/simserial.c were due to patches to
simserial that had alredy been included (with lots of further cleanups)
in the serial tree.

* tag 'ia64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  Documentation/kernel-parameters: remove inttest parameter
  [IA64] Fix ISA IRQ trigger model and polarity setting
  [IA64] Fix a couple of warnings for EXPORT_SYMBOL
  [IA64] Check return from device_register() in cx_device_register()
  [IA64] Fix warning from machine_kexec.c
  [IA64] simserial, bail out when request_irq fails
  [IA64] hpsim, initialize chip for assigned irqs
  [IA64] simserial, include some headers
  [IA64] hpsim, fix SAL handling in fw-emu
  [IA64] genirq fixup for SGI/SN
  [IA64] disable interrupts when exiting from ia64_mca_cmc_int_handler()

2012-03-23 17:19:37 -07:00

..

8250

serial: remove back and forth conversions in serial_out_sync

2012-03-09 12:47:56 -08:00

cpm_uart

TTY: serial, fix includes in some drivers

2011-09-22 15:49:26 -07:00

jsm

jsm: Fixed EEH recovery error

2012-01-24 12:55:36 -08:00

21285.c

serial: Kill off NO_IRQ

2012-01-26 17:14:50 -08:00

68328serial.c

TTY: remove unneeded tty->index checks

2012-03-08 11:42:21 -08:00

68328serial.h

TTY: serial, remove dead code from 68328

2011-09-22 15:47:54 -07:00

altera_jtaguart.c

Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6

2011-10-27 08:35:41 +02:00

altera_uart.c

tty: serial: altera_uart: Add CONSOLE_POLL support

2012-02-09 09:04:24 -08:00

amba-pl010.c

serial: pl010: Enable module alias autogeneration for AMBA drivers

2011-11-22 10:58:32 +00:00

amba-pl011.c

serial: PL011: clear pending interrupts

2012-03-14 12:27:39 -07:00

apbuart.c

apbuart: fix section mismatch warning

2011-12-27 16:33:13 -05:00

apbuart.h

…

ar933x_uart.c

SERIAL: AR933X: Add driver for the built-in UART of the SoC

2011-12-07 22:02:46 +00:00

atmel_serial.c

atmel_serial: fix spinlock lockup in RS485 code

2012-01-04 16:19:34 -08:00

bcm63xx_uart.c

serial: bcm63xx_uart: fix irq storm after rx fifo overrun.

2011-06-16 12:01:58 -07:00

bfin_sport_uart.c

serial: bfin-sport-uart: Add tty ASYNC_CTS_FLOW flag to do CTS flow control.

2011-12-09 19:05:33 -08:00

bfin_sport_uart.h

tty: bfin-sport-uart: Rx interrupt is not called always with irq disabled.

2011-12-09 19:05:33 -08:00

bfin_uart.c

serial: bfin-uart: Don't access tty circular buffer in TX DMA interrupt after it is reset.

2012-03-13 14:33:39 -07:00

clps711x.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

crisv10.c

TTY: remove unneeded tty->index checks

2012-03-08 11:42:21 -08:00

crisv10.h

…

dz.c

TTY: serial, fix includes in some drivers

2011-09-22 15:49:26 -07:00

dz.h

…

efm32-uart.c

serial/efm32: add new driver

2012-01-26 11:29:47 -08:00

icom.c

TTY: irq: Remove IRQF_DISABLED

2011-09-22 16:08:57 -07:00

icom.h

…

ifx6x60.c

TTY: remove re-assignments to tty_driver members

2012-03-08 11:37:58 -08:00

ifx6x60.h

serial: ifx6x60: minor cleanup

2011-02-17 11:16:15 -08:00

imx.c

tty: serial: imx: move del_timer_sync() to avoid potential deadlock

2012-01-04 16:30:36 -08:00

ioc3_serial.c

TTY: serial, fix includes in some drivers

2011-09-22 15:49:26 -07:00

ioc4_serial.c

TTY: remove serialP.h inclusion from some files

2012-03-08 11:47:02 -08:00

ip22zilog.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

ip22zilog.h

…

Kconfig

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2012-03-21 18:55:10 -07:00

kgdboc.c

tty: Add module.h to drivers/tty users who just expect it there.

2011-10-31 19:31:27 -04:00

lantiq.c

Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2011-10-26 15:11:09 +02:00

m32r_sio_reg.h

m32r: relocate drivers back out of 8250 dir

2012-02-08 15:04:32 -08:00

m32r_sio.c

TTY: remove serialP.h inclusion from some files

2012-03-08 11:47:02 -08:00

m32r_sio.h

TTY: serial, include pci.h in m32r_sio

2012-03-08 11:47:02 -08:00

Makefile

Merge tag 'tty-3.3-rc3' tty-next

2012-02-10 10:25:27 -08:00

max3100.c

TTY: Remove redundant spi driver bus initialization

2011-11-26 20:19:21 -08:00

max3107.c

TTY: Remove redundant spi driver bus initialization

2011-11-26 20:19:21 -08:00

max3107.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

mcf.c

TTY: irq: Remove IRQF_DISABLED

2011-09-22 16:08:57 -07:00

mfd.c

Merge 3.2-rc3 into tty-next to handle merge conflict in tty_ldisc.c

2011-11-26 20:07:25 -08:00

mpc52xx_uart.c

mpc5200b/uart: select more tolerant uart prescaler on low baudrates

2012-03-08 13:15:50 -08:00

mpsc.c

…

mrst_max3110.c

TTY: Remove redundant spi driver bus initialization

2011-11-26 20:19:21 -08:00

mrst_max3110.h

max3110: add sysrq support

2011-08-26 11:01:15 -07:00

msm_serial_hs.c

msm_serial_hs: Fix spinlock recursion in handling CTS

2011-12-09 19:10:04 -08:00

msm_serial.c

Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-soc

2011-11-01 21:02:35 -07:00

msm_serial.h

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

msm_smd_tty.c

TTY: remove re-assignments to tty_driver members

2012-03-08 11:37:58 -08:00

mux.c

tty/serial/mux.c: linux/tty.h included twice

2012-02-24 13:50:45 -08:00

mxs-auart.c

Merge tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-01-09 14:44:15 -08:00

netx-serial.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

nwpserial.c

tty: Add export.h for EXPORT_SYMBOL/THIS_MODULE to exporters

2011-10-31 19:31:28 -04:00

of_serial.c

drivercore: Add helper macro for platform_driver boilerplate

2011-10-25 00:35:47 +02:00

omap-serial.c

tty: serial: OMAP: Fix oops due to NULL pdata in DT boot

2012-03-08 10:56:44 -08:00

pch_uart.c

pch_uart: Add module parameter descriptions

2012-03-09 12:43:20 -08:00

pmac_zilog.c

serial: Kill off NO_IRQ

2012-01-26 17:14:50 -08:00

pmac_zilog.h

tty/serial/pmac_zilog: Fix suspend & resume

2011-12-16 11:10:01 +11:00

pnx8xxx_uart.c

…

pxa.c

serial: pxa: add clk_prepare/clk_unprepare calls

2012-03-15 13:46:04 -07:00

sa1100.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

samsung.c

serial: samsung: fix s3c2442 platform data

2012-02-24 13:50:46 -08:00

samsung.h

serial: samsung: merge probe() function from all SoC specific extensions

2011-12-23 10:07:00 +09:00

sb1250-duart.c

TTY: serial, fix includes in some drivers

2011-09-22 15:49:26 -07:00

sc26xx.c

TTY: serial: convert drivers/tty/serial/* to use module_platform_driver()

2011-11-30 20:11:46 +09:00

serial_core.c

TTY: remove re-assignments to tty_driver members

2012-03-08 11:37:58 -08:00

serial_ks8695.c

TTY: irq: Remove IRQF_DISABLED

2011-09-22 16:08:57 -07:00

serial_txx9.c

TTY: serial, fix includes in some drivers

2011-09-22 15:49:26 -07:00

sh-sci.c

sh-sci / PM: Avoid deadlocking runtime PM

2012-03-09 12:59:44 +09:00

sh-sci.h

ARM: mach-shmobile: R-Mobile A1 support.

2011-11-11 16:55:31 +09:00

sirfsoc_uart.c

pinctrl: API changes to support multiple states per device

2012-03-05 11:22:59 +01:00

sirfsoc_uart.h

serial/sirf: fixup for changes to pin control

2012-02-22 17:59:12 +01:00

sn_console.c

Merge tag 'ia64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

2012-03-23 17:19:37 -07:00

suncore.c

tty: sparc: rename drivers/tty/serial/suncore.h -> include/linux/sunserialcore.h

2012-02-10 10:44:35 -08:00

sunhv.c

tty: sparc: rename drivers/tty/serial/suncore.h -> include/linux/sunserialcore.h

2012-02-10 10:44:35 -08:00

sunsab.c

tty: sparc: rename drivers/tty/serial/suncore.h -> include/linux/sunserialcore.h

2012-02-10 10:44:35 -08:00

sunsab.h

…

sunsu.c

tty: sparc: rename drivers/tty/serial/suncore.h -> include/linux/sunserialcore.h

2012-02-10 10:44:35 -08:00

sunzilog.c

tty: sparc: rename drivers/tty/serial/suncore.h -> include/linux/sunserialcore.h

2012-02-10 10:44:35 -08:00

sunzilog.h

…

timbuart.c

TTY: serial: convert drivers/tty/serial/* to use module_platform_driver()

2011-11-30 20:11:46 +09:00

timbuart.h

…

uartlite.c

Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6

2011-10-27 08:35:41 +02:00

ucc_uart.c

serial: Kill off NO_IRQ

2012-01-26 17:14:50 -08:00

vr41xx_siu.c

serial: Kill off NO_IRQ

2012-01-26 17:14:50 -08:00

vt8500_serial.c

tty: serial: vt8500: fix annotations for probe/remove

2012-03-12 10:21:55 -07:00

xilinx_uartps.c

tty: Add module.h to drivers/tty users who just expect it there.

2011-10-31 19:31:27 -04:00

zs.c

TTY: serial, fix includes in some drivers

2011-09-22 15:49:26 -07:00

zs.h

…