You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 1685e633b3 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: pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq pcmcia: do not request windows if you don't need to pcmcia: insert PCMCIA device resources into resource tree pcmcia: export resource information to sysfs pcmcia: use struct resource for PCMCIA devices, part 2 pcmcia: remove memreq_t pcmcia: move local definitions out of include/pcmcia/cs.h pcmcia: do not use io_req_t when calling pcmcia_request_io() pcmcia: do not use io_req_t after call to pcmcia_request_io() pcmcia: use struct resource for PCMCIA devices pcmcia: clean up cs.h pcmcia: use pcmica_{read,write}_config_byte pcmcia: remove cs_types.h pcmcia: remove unused flag, simplify headers pcmcia: remove obsolete CS_EVENT_ definitions pcmcia: split up central event handler pcmcia: simplify event callback pcmcia: remove obsolete ioctl Conflicts in: - drivers/staging/comedi/drivers/* - drivers/staging/wlags49_h2/wl_cs.c due to dev_info_t and whitespace changes		15 years ago
..
cpm_uart	Merge branch 'master' into for-next	15 years ago
jsm	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
8250.c	SERIAL: 8250: Remove SERIAL_8250_AU1X00	15 years ago
8250.h	serial: 8250: add IRQ trigger support	16 years ago
8250_accent.c	…
8250_acorn.c	…
8250_boca.c	…
8250_early.c	…
8250_exar_st16c554.c	…
8250_fourport.c	…
8250_gsc.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
8250_hp300.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
8250_hub6.c	…
8250_mca.c	…
8250_pci.c	serial: add support for various Titan PCI cards	15 years ago
8250_pnp.c	serial: 8250_pnp - add Fujitsu Wacom device	15 years ago
21285.c	ARM: 5874/1: serial21285: fix disable_irq-from-interrupt-handler deadlock	15 years ago
68328serial.c	m68knommu: fix broken use of BUAD_TABLE_SIZE in 68328serial driver	15 years ago
68328serial.h	…
68360serial.c	comment typo fixes: charater => character	15 years ago
Kconfig	SERIAL: 8250: Remove SERIAL_8250_AU1X00	15 years ago
Makefile	serial: Add driver for the Altera UART	15 years ago
altera_jtaguart.c	serial: Add driver for the Altera JTAG UART	15 years ago
altera_uart.c	serial: altera_uart: Proper section for altera_uart_remove	15 years ago
amba-pl010.c	ARM: Fix section build warnings for AMBA drivers	15 years ago
amba-pl011.c	ARM: Fix section build warnings for AMBA drivers	15 years ago
apbuart.c	of: Remove duplicate fields from of_platform_driver	15 years ago
apbuart.h	sparc: Support for GRLIB APBUART serial port	15 years ago
atmel_serial.c	serial: fix rs485 for atmel_serial on avr32	15 years ago
bcm63xx_uart.c	serial: bcm63xx_uart: allow more than one uart to be registered.	15 years ago
bfin_5xx.c	serial: bfin_5xx: fix typo in IER check	15 years ago
bfin_sport_uart.c	serial: bfin_sport_uart: Use resource size to fix off-by-one error	15 years ago
bfin_sport_uart.h	serial: bfin_sport_uart: add support for CTS/RTS via GPIOs	15 years ago
clps711x.c	serial: kill off uart_info	16 years ago
crisv10.c	CRIS: fix defconfig build failure	16 years ago
crisv10.h	…
dz.c	serial: kill off uart_info	16 years ago
dz.h	…
icom.c	tty: Fix up char drivers request_room usage	15 years ago
icom.h	…
imx.c	serial: imx.c: fix CTS trigger level lower to avoid lost chars	15 years ago
ioc3_serial.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
ioc4_serial.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
ip22zilog.c	serial: move delta_msr_wait into the tty_port	16 years ago
ip22zilog.h	…
kgdboc.c	kgdboc: Add call backs to allow kernel mode switching	15 years ago
m32r_sio.c	serial: kill off uart_info	16 years ago
m32r_sio.h	…
m32r_sio_reg.h	…
max3100.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
mcf.c	m68knommu: allow 4 coldfire serial ports	15 years ago
mpc52xx_uart.c	powerpc/5200: improve uart baud rate calculation (reach high baud rates, better accuracy)	15 years ago
mpsc.c	powerpc/mpsc: Set the port device in the mpsc serial driver	15 years ago
msm_serial.c	msm_serial: fix serial on trout	15 years ago
msm_serial.h	msm_serial: fix serial on trout	15 years ago
mux.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
netx-serial.c	serial: kill off uart_info	16 years ago
nwpserial.c	fix comnment/printk typos concerning "empty"	15 years ago
of_serial.c	of: Remove duplicate fields from of_platform_driver	15 years ago
pmac_zilog.c	powerpc/macio: Fix probing of macio devices by using the right of match table	15 years ago
pmac_zilog.h	pmac-zilog: add platform driver	15 years ago
pnx8xxx_uart.c	serial: move delta_msr_wait into the tty_port	16 years ago
pxa.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
s3c24a0.c	ARM: S3C: Update Simtec copyright statements from , to - [2]	15 years ago
s3c2400.c	…
s3c2410.c	ARM: S3C: Update Simtec copyright statements from , to - [2]	15 years ago
s3c2412.c	ARM: S3C2412: SoC has the fractional baud rate register	15 years ago
s3c2440.c	ARM: S3C: Update Simtec copyright statements from , to - [2]	15 years ago
s3c6400.c	…
s5pv210.c	ARM: S5PV210: serial: Fix section mismatch warning	15 years ago
sa1100.c	ARM: Fix SA1100 Neponset serial section mismatch	16 years ago
samsung.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	15 years ago
samsung.h	ARM: SAMSUNG: serial: Modify console initialization.	15 years ago
sb1250-duart.c	serial: move delta_msr_wait into the tty_port	16 years ago
sc26xx.c	serial: kill off uart_info	16 years ago
serial_core.c	serial: Fix crash if the minimum rate of the device is > 9600 baud	15 years ago
serial_cs.c	pcmcia: do not use io_req_t when calling pcmcia_request_io()	15 years ago
serial_ks8695.c	ARM: 6030/1: KS8695: enable console	15 years ago
serial_lh7a40x.c	serial: move delta_msr_wait into the tty_port	16 years ago
serial_txx9.c	serial_txx9: use container_of() instead of direct cast	16 years ago
sh-sci.c	sh: fix Oops in the serial SCI driver	15 years ago
sh-sci.h	SH: fix SCIFA SCASCR register bit definitions	15 years ago
sn_console.c	fix typos concerning "initiali[zs]e"	15 years ago
suncore.c	sunserial: Don't call add_preferred_console() when console= is specified.	15 years ago
suncore.h	serial: suncore: Fix RSC/LOM handling in sunserial_console_termios().	15 years ago
sunhv.c	of/platform: remove all of_bus_type and of_platform_bus_type references	15 years ago
sunsab.c	of/platform: remove all of_bus_type and of_platform_bus_type references	15 years ago
sunsab.h	…
sunsu.c	of/platform: remove all of_bus_type and of_platform_bus_type references	15 years ago
sunzilog.c	of/platform: remove all of_bus_type and of_platform_bus_type references	15 years ago
sunzilog.h	…
timbuart.c	serial: timbuart: make sure last byte is sent when port is closed	15 years ago
timbuart.h	…
uartlite.c	of/address: Clean up function declarations	15 years ago
ucc_uart.c	of: Remove duplicate fields from of_platform_driver	15 years ago
vr41xx_siu.c	serial: move delta_msr_wait into the tty_port	16 years ago
zs.c	serial: move delta_msr_wait into the tty_port	16 years ago
zs.h	…