Linus Torvalds 2be4ff2f08 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits) pcmcia: ioctl-internal definitions pcmcia: cistpl header cleanup pcmcia: remove unused argument to pcmcia_parse_tuple() pcmcia: card services header cleanup pcmcia: device_id header cleanup pcmcia: encapsulate ioaddr_t pcmcia: cleanup device driver header file pcmcia: cleanup socket services header file pcmcia: merge ds_internal.h into cs_internal.h pcmcia: cleanup cs_internal.h pcmcia: cs_internal.h is internal pcmcia: use dev_printk for cs_error() pcmcia: remove CS_ error codes alltogether pcmcia: deprecate CS_BAD_TUPLE pcmcia: deprecate CS_BAD_ARGS pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE pcmcia: deprecate CS_NO_MORE_ITEMS pcmcia: deprecate CS_IN_USE pcmcia: deprecate CS_CONFIGURATION_LOCKED ... Fix trivial conflict in drivers/pcmcia/ds.c manually		2008-10-13 14:12:40 -07:00
..
cpm_uart	cpm_uart: Add generic clock API support to set baudrates	2008-07-28 08:47:32 -05:00
jsm	…
8250.c	serial: fix device name reporting when minor space is shared between drivers	2008-10-13 09:51:44 -07:00
8250.h	8250: improve workaround for UARTs that don't re-assert THRE correctly	2008-09-02 19:21:38 -07:00
8250_accent.c	…
8250_acorn.c	…
8250_boca.c	…
8250_early.c	…
8250_exar_st16c554.c	…
8250_fourport.c	…
8250_gsc.c	serial/8250_gsc.c: add MODULE_LICENSE	2008-07-24 10:47:29 -07:00
8250_hp300.c	…
8250_hub6.c	…
8250_mca.c	…
8250_pci.c	serial_8250: pci_enable_device fail is not fully handled	2008-10-13 09:51:39 -07:00
8250_pnp.c	…
21285.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
68328serial.c	…
68328serial.h	…
68360serial.c	…
Kconfig	serial: allow 8250 to be used on sparc	2008-10-13 09:51:40 -07:00
Makefile	serial: allow 8250 to be used on sparc	2008-10-13 09:51:40 -07:00
amba-pl010.c	…
amba-pl011.c	…
atmel_serial.c	atmel_serial: update the powersave handler to match serial core	2008-09-23 08:09:14 -07:00
bfin_5xx.c	Blackfin Serial Driver: Fix bug - request UART2/3 peripheral mapped interrupts in PIO mode	2008-10-13 09:51:38 -07:00
bfin_sport_uart.c	…
bfin_sport_uart.h	…
clps711x.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
crisv10.c	tty: simplify ktermios allocation	2008-10-13 09:51:44 -07:00
crisv10.h	cris: Fixup compile problems	2008-08-04 17:12:07 -07:00
dz.c	serial: DZ11: avoid a hang at console switch-over	2008-07-24 10:47:29 -07:00
dz.h	…
icom.c	…
icom.h	…
imx.c	imx serial: fix rts handling for non imx1 based hardware	2008-09-02 10:19:30 +02:00
ioc3_serial.c	…
ioc4_serial.c	…
ip22zilog.c	…
ip22zilog.h	…
kgdboc.c	…
m32r_sio.c	…
m32r_sio.h	…
m32r_sio_reg.h	…
mcf.c	…
mpc52xx_uart.c	…
mpsc.c	kgdb: kgdboc console poll hooks for mpsc uart	2008-07-23 11:30:16 -05:00
mux.c	…
netx-serial.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
of_serial.c	…
pmac_zilog.c	…
pmac_zilog.h	…
pnx8xxx_uart.c	…
pxa.c	[ARM] 5244/1: Add hardware CTSRTS flow control to pxa serial driver	2008-09-09 16:32:53 +01:00
s3c2400.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
s3c2410.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
s3c2412.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
s3c2440.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
sa1100.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
samsung.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
samsung.h	…
sb1250-duart.c	…
sc26xx.c	…
serial_core.c	serial: fix device name reporting when minor space is shared between drivers	2008-10-13 09:51:44 -07:00
serial_cs.c	pcmcia: remove unused argument to pcmcia_parse_tuple()	2008-08-31 15:50:33 +02:00
serial_ks8695.c	[ARM] 5250/1: unbalanced enable_irq() for serial_ks8695.c fix	2008-10-01 22:41:43 +01:00
serial_lh7a40x.c	…
serial_txx9.c	…
sh-sci.c	sh: Add SCIF2 support for SH7763.	2008-07-28 18:10:29 +09:00
sh-sci.h	serial: sh-sci: Fix up SH7760/SH7780/SH7785 early printk regression.	2008-07-30 00:56:39 +09:00
sn_console.c	…
suncore.c	…
suncore.h	…
sunhv.c	sparc: Annotate of_device_id arrays with const or __initdata.	2008-08-31 01:23:17 -07:00
sunsab.c	sparc: Annotate of_device_id arrays with const or __initdata.	2008-08-31 01:23:17 -07:00
sunsab.h	…
sunsu.c	sparc: Annotate of_device_id arrays with const or __initdata.	2008-08-31 01:23:17 -07:00
sunzilog.c	sparc: Annotate of_device_id arrays with const or __initdata.	2008-08-31 01:23:17 -07:00
sunzilog.h	…
uartlite.c	…
ucc_uart.c	…
vr41xx_siu.c	…
zs.c	serial: Z85C30: avoid a hang at console switch-over	2008-07-24 10:47:29 -07:00
zs.h	…