kevin/linux
1
Fork 0
Code
bd788c9665
linux/drivers/serial
History
Linus Torvalds 636d17427b Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (226 commits)
  ARM: 6323/1: cam60: don't use __init for cam60_spi_{flash_platform_data,partitions}
  ARM: 6324/1: cam60: move cam60_spi_devices to .init.data
  ARM: 6322/1: imx/pca100: Fix name of spi platform data
  ARM: 6321/1: fix syntax error in main Kconfig file
  ARM: 6297/1: move U300 timer to dynamic clock lookup
  ARM: 6296/1: clock U300 intcon and timer properly
  ARM: 6295/1: fix U300 apb_pclk split
  ARM: 6306/1: fix inverted MMC card detect in U300
  ARM: 6299/1: errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID
  ARM: 6294/1: etm: do a dummy read from OSSRR during initialization
  ARM: 6292/1: coresight: add ETM management registers
  ARM: 6288/1: ftrace: document mcount formats
  ARM: 6287/1: ftrace: clean up mcount assembly indentation
  ARM: 6286/1: fix Thumb-2 decompressor broken by "Auto calculate ZRELADDR"
  ARM: 6281/1: video/imxfb.c: allow usage without BACKLIGHT_CLASS_DEVICE
  ARM: 6280/1: imx: Fix build failure when including <mach/gpio.h> without <linux/spinlock.h>
  ARM: S5PV210: Fix on missing s3c-sdhci card detection method for hsmmc3
  ARM: S5P: Fix on missing S5P_DEV_FIMC in plat-s5p/Kconfig
  ARM: S5PV210: Override FIMC driver name on Aquila board
  ARM: S5PC100: enable FIMC on SMDKC100
  ...

Fix up conflicts in arch/arm/mach-{s5pc100,s5pv210}/cpu.c due to
different subsystem 'setname' calls, and trivial port types in
include/linux/serial_core.h
2010-08-11 09:13:19 -07:00
..
cpm_uart Merge branch 'master' into for-next 2010-08-04 15:14:38 +02:00
jsm include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
8250_accent.c
8250_acorn.c
8250_boca.c
8250_early.c serial: MMIO32 support for 8250_early.c 2010-08-10 13:47:45 -07:00
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 2010-03-30 22:02:32 +09:00
8250_hp300.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
8250_hub6.c
8250_mca.c
8250_pci.c serial: add support for OX16PCI958 card 2010-08-10 13:47:45 -07:00
8250_pnp.c serial: 8250_pnp - add Fujitsu Wacom device 2010-04-30 09:20:34 -07:00
8250.c U6715 16550A serial driver support 2010-08-10 13:47:46 -07:00
8250.h
21285.c tty: serial - fix tty back references in termios 2010-08-10 13:47:41 -07:00
68328serial.c serial: 68328serial.c: remove dead (ALMA_ANS | DRAGONIXVZ | M68EZ328ADS) 2010-08-10 13:47:45 -07:00
68328serial.h
68360serial.c tty: release BTM while sleeping in block_til_ready 2010-08-10 13:47:44 -07:00
altera_jtaguart.c serial: Add driver for the Altera JTAG UART 2010-05-21 09:34:30 -07:00
altera_uart.c serial: "altera_uart: simplify altera_uart_console_putc()" checkpatch fixes 2010-08-10 13:47:45 -07:00
amba-pl010.c ARM: Fix section build warnings for AMBA drivers 2010-07-27 10:48:43 +01:00
amba-pl011.c ARM: Fix section build warnings for AMBA drivers 2010-07-27 10:48:43 +01:00
apbuart.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
apbuart.h sparc: Support for GRLIB APBUART serial port 2009-11-04 08:44:54 -08:00
atmel_serial.c serial: general fixes in the serial_rs485 structure 2010-08-10 13:47:45 -07:00
bcm63xx_uart.c serial: bcm63xx_uart: allow more than one uart to be registered. 2010-03-02 14:43:19 -08:00
bfin_5xx.c tty: serial - fix tty referencing in set_ldisc 2010-08-10 13:47:41 -07:00
bfin_sport_uart.c serial: bfin_sport_uart: Use resource size to fix off-by-one error 2010-05-21 09:34:30 -07:00
bfin_sport_uart.h serial: bfin_sport_uart: add support for CTS/RTS via GPIOs 2010-05-21 09:34:27 -07:00
clps711x.c
crisv10.c serial: crisv10: formatting of pointers in printk() 2010-08-10 13:47:44 -07:00
crisv10.h
dz.c
dz.h
icom.c tty: Fix up char drivers request_room usage 2010-03-02 14:43:22 -08:00
icom.h
imx.c tty: serial - fix tty back references in termios 2010-08-10 13:47:41 -07:00
ioc3_serial.c tty: serial - fix tty back references in termios 2010-08-10 13:47:41 -07:00
ioc4_serial.c tty: serial - fix tty back references in termios 2010-08-10 13:47:41 -07:00
ip22zilog.c
ip22zilog.h
Kconfig Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2010-08-11 09:13:19 -07:00
kgdboc.c kgdboc: Add call backs to allow kernel mode switching 2010-08-05 09:22:30 -05:00
m32r_sio_reg.h
m32r_sio.c
m32r_sio.h
Makefile hsu: driver for Medfield High Speed UART device 2010-08-10 13:47:46 -07:00
max3100.c tty: serial - fix tty back references in termios 2010-08-10 13:47:41 -07:00
max3107-aava.c serial: max3107: Abstract out the platform specific bits 2010-08-10 13:47:44 -07:00
max3107.c serial: max3107: Abstract out the platform specific bits 2010-08-10 13:47:44 -07:00
max3107.h serial: max3107: Fix gpiolib support 2010-08-10 13:47:46 -07:00
mcf.c serial: mcf: don't take spinlocks in already protected functions 2010-08-10 13:47:45 -07:00
mfd.c hsu: call PCI pm hooks in suspend/resume function 2010-08-10 13:47:46 -07:00
mpc52xx_uart.c powerpc/5200: improve uart baud rate calculation (reach high baud rates, better accuracy) 2010-07-24 18:27:57 -06:00
mpsc.c powerpc/mpsc: Set the port device in the mpsc serial driver 2010-04-07 14:12:36 +10:00
mrst_max3110.c serial: fix wakup races in the mrst_max3110 driver 2010-08-10 13:47:39 -07:00
mrst_max3110.h mrst_max3110: add UART driver for Max3110 on Moorestown 2010-08-10 13:47:39 -07:00
msm_serial.c msm_serial: fix serial on trout 2010-06-04 13:37:16 -07:00
msm_serial.h msm_serial: fix serial on trout 2010-06-04 13:37:16 -07:00
mux.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
netx-serial.c
nwpserial.c fix comnment/printk typos concerning "empty" 2010-07-12 18:03:50 +02:00
of_serial.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
pmac_zilog.c powerpc/macio: Fix probing of macio devices by using the right of match table 2010-06-02 17:50:38 +10:00
pmac_zilog.h pmac-zilog: add platform driver 2010-02-27 18:31:02 +01:00
pnx8xxx_uart.c
pxa.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
s3c24a0.c ARM: S3C: Update Simtec copyright statements from , to - [2] 2009-12-01 01:33:51 +00:00
s3c2400.c
s3c2410.c ARM: S3C: Update Simtec copyright statements from , to - [2] 2009-12-01 01:33:51 +00:00
s3c2412.c ARM: S3C2412: SoC has the fractional baud rate register 2010-02-03 01:55:01 +00:00
s3c2440.c ARM: S3C: Update Simtec copyright statements from , to - [2] 2009-12-01 01:33:51 +00:00
s3c6400.c
s5pv210.c ARM: S5PV310: Add serial port support 2010-08-05 18:32:42 +09:00
sa1100.c ARM: Fix SA1100 Neponset serial section mismatch 2009-09-28 18:06:16 +01:00
samsung.c ARM: SAMSUNG: serial: Add FRACVAL support for newer UART 2010-08-05 18:32:41 +09:00
samsung.h ARM: SAMSUNG: serial: Modify console initialization. 2010-01-19 17:50:47 +09:00
sb1250-duart.c
sc26xx.c
serial_core.c tty: untangle locking of wait_until_sent 2010-08-10 13:47:43 -07:00
serial_cs.c pcmcia: do not use io_req_t when calling pcmcia_request_io() 2010-08-03 09:04:11 +02:00
serial_ks8695.c ARM: 6030/1: KS8695: enable console 2010-04-23 10:01:56 +01:00
serial_lh7a40x.c
serial_txx9.c serial_txx9: use container_of() instead of direct cast 2009-10-01 16:11:15 -07:00
sh-sci.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2010-05-31 13:14:26 +09:00
sh-sci.h serial: sh-sci: fix handling of SCIFB sh-mobile ports 2010-05-24 08:53:37 +09:00
sn_console.c fix typos concerning "initiali[zs]e" 2010-06-16 18:05:05 +02:00
suncore.c sunserial: Don't call add_preferred_console() when console= is specified. 2010-05-25 23:51:17 -07:00
suncore.h serial: suncore: Fix RSC/LOM handling in sunserial_console_termios(). 2009-11-24 14:09:56 -08:00
sunhv.c of/platform: remove all of_bus_type and of_platform_bus_type references 2010-07-24 09:57:52 -06:00
sunsab.c of/platform: remove all of_bus_type and of_platform_bus_type references 2010-07-24 09:57:52 -06:00
sunsab.h
sunsu.c of/platform: remove all of_bus_type and of_platform_bus_type references 2010-07-24 09:57:52 -06:00
sunzilog.c of/platform: remove all of_bus_type and of_platform_bus_type references 2010-07-24 09:57:52 -06:00
sunzilog.h
timbuart.c timbuart: use __devinit and __devexit macros for probe and remove 2010-08-10 13:47:45 -07:00
timbuart.h
uartlite.c of/address: Clean up function declarations 2010-08-01 01:42:42 -06:00
ucc_uart.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
vr41xx_siu.c
zs.c
zs.h