1
0
Fork 0
alistair23-linux/drivers/tty/serial
Linus Torvalds e16b396ce3 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)
  doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
  Update cpuset info & webiste for cgroups
  dcdbas: force SMI to happen when expected
  arch/arm/Kconfig: remove one to many l's in the word.
  asm-generic/user.h: Fix spelling in comment
  drm: fix printk typo 'sracth'
  Remove one to many n's in a word
  Documentation/filesystems/romfs.txt: fixing link to genromfs
  drivers:scsi Change printk typo initate -> initiate
  serial, pch uart: Remove duplicate inclusion of linux/pci.h header
  fs/eventpoll.c: fix spelling
  mm: Fix out-of-date comments which refers non-existent functions
  drm: Fix printk typo 'failled'
  coh901318.c: Change initate to initiate.
  mbox-db5500.c Change initate to initiate.
  edac: correct i82975x error-info reported
  edac: correct i82975x mci initialisation
  edac: correct commented info
  fs: update comments to point correct document
  target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
  ...

Trivial conflict in fs/eventpoll.c (spelling vs addition)
2011-03-18 10:37:40 -07:00
..
cpm_uart dt/serial: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:46 -07:00
jsm
8250.c serial: change the divisor latch only when prescalar actually changed 2011-02-17 11:23:50 -08:00
8250.h
8250_accent.c
8250_acorn.c
8250_boca.c
8250_early.c
8250_exar_st16c554.c
8250_fourport.c
8250_gsc.c
8250_hp300.c
8250_hub6.c
8250_mca.c
8250_pci.c
8250_pnp.c
21285.c
68328serial.c Merge 2.6.38-rc6 into tty-next 2011-02-24 11:36:31 -08:00
68328serial.h 68328serial: remove unsed m68k_serial->tqueue_hangup 2011-02-03 14:16:49 -08:00
68360serial.c Merge 2.6.38-rc6 into tty-next 2011-02-24 11:36:31 -08:00
Kconfig Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
Makefile Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
altera_jtaguart.c Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6 2011-03-16 17:28:10 -07:00
altera_uart.c Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6 2011-03-16 17:28:10 -07:00
amba-pl010.c ARM: amba: make probe() functions take const id tables 2011-02-23 16:24:14 +00:00
amba-pl011.c Merge branches 'aaci', 'mmci-dma', 'pl' and 'pl011' into drivers 2011-03-17 11:04:51 +00:00
apbuart.c dt/serial: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:46 -07:00
apbuart.h
atmel_serial.c atmel_serial: enable PPS support 2011-02-17 11:26:12 -08:00
bcm63xx_uart.c
bfin_5xx.c serial: bfin_5xx: split uart RX lock from uart port lock to avoid deadlock 2011-02-03 14:44:54 -08:00
bfin_sport_uart.c tty: serial: bfin_sport_uart: fix signedness error 2011-02-03 11:40:46 -08:00
bfin_sport_uart.h
clps711x.c
crisv10.c tty: now phase out the ioctl file pointer for good 2011-02-17 11:59:56 -08:00
crisv10.h
dz.c
dz.h
icom.c
icom.h
ifx6x60.c tiocmset: kill the file pointer argument 2011-02-17 11:52:43 -08:00
ifx6x60.h serial: ifx6x60: minor cleanup 2011-02-17 11:16:15 -08:00
imx.c
ioc3_serial.c
ioc4_serial.c
ip22zilog.c
ip22zilog.h
kgdboc.c
m32r_sio.c
m32r_sio.h
m32r_sio_reg.h
max3100.c workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable' 2011-02-16 17:48:59 +01:00
max3107-aava.c
max3107.c workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable' 2011-02-16 17:48:59 +01:00
max3107.h
mcf.c
mfd.c serial: mfd: add a module parameter for setting each port's working mode 2011-02-22 15:49:00 -08:00
mpc52xx_uart.c dt/serial: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:46 -07:00
mpsc.c
mrst_max3110.c serial: mrst_max3110: make buffer larger 2011-02-03 14:13:17 -08:00
mrst_max3110.h
msm_serial.c Merge branch 'msm-uart' into for-next 2011-01-24 11:16:43 -08:00
msm_serial.h Merge branch 'msm-uart' into for-next 2011-01-24 11:16:43 -08:00
msm_serial_hs.c serial: msm_serial_hs: Add MSM high speed UART driver 2011-03-07 12:08:05 -08:00
msm_smd_tty.c tty: Add msm_smd_tty driver 2011-02-17 11:25:38 -08:00
mux.c
mxs-auart.c Freescale STMP37XX/STMP378X Application UART driver: remove duplicate linux/device.h include 2011-02-15 18:35:42 +01:00
netx-serial.c
nwpserial.c
of_serial.c Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6 2011-03-16 17:28:10 -07:00
omap-serial.c serial: omap-serial: Enable the UART wake-up bits always 2011-02-03 14:10:22 -08:00
pch_uart.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-03-18 10:37:40 -07:00
pmac_zilog.c
pmac_zilog.h
pnx8xxx_uart.c
pxa.c
s3c24a0.c
s3c2400.c
s3c2410.c
s3c2412.c
s3c2440.c
s3c6400.c
s5pv210.c
sa1100.c
samsung.c
samsung.h
sb1250-duart.c console: rename acquire/release_console_sem() to console_lock/unlock() 2011-01-26 10:50:06 +10:00
sc26xx.c
serial_core.c tty: now phase out the ioctl file pointer for good 2011-02-17 11:59:56 -08:00
serial_cs.c fmvj18x_cs: add new id 2011-02-28 12:06:20 -08:00
serial_ks8695.c
serial_txx9.c
sh-sci.c serial: sh-sci: fix deadlock when resuming from S3 sleep 2011-03-04 15:57:10 +09:00
sh-sci.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework 2011-01-26 18:23:27 +09:00
sn_console.c
suncore.c
suncore.h
sunhv.c dt/serial: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:46 -07:00
sunsab.c dt/serial: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:46 -07:00
sunsab.h
sunsu.c dt/serial: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:46 -07:00
sunzilog.c dt/serial: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:46 -07:00
sunzilog.h
timbuart.c
timbuart.h
uartlite.c dt: uartlite: merge platform and of_platform driver bindings 2011-02-28 13:22:43 -07:00
ucc_uart.c Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2011-03-18 06:31:43 -07:00
vr41xx_siu.c
vt8500_serial.c
zs.c
zs.h