linux-sg2042/drivers/staging/speakup
Linus Torvalds 3498d13b80 TTY merge for 3.7-rc1
As we skipped the merge window for 3.6-rc1 for the tty tree, everything
 is now settled down and working properly, so we are ready for 3.7-rc1.
 Here's the patchset, it's big, but the large changes are removing a
 firmware file and adding a staging tty driver (it depended on the tty
 core changes, so it's going through this tree instead of the staging
 tree.)
 
 All of these patches have been in the linux-next tree for a while.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iEYEABECAAYFAlBp36oACgkQMUfUDdst+yk4WgCdEy13hot8fI2Lqnc7W0LKu7GX
 4p8AoLTjzrXhLosxdijskDQ9X1OtjrxU
 =S5Ng
 -----END PGP SIGNATURE-----

Merge tag 'tty-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull TTY changes from Greg Kroah-Hartman:
 "As we skipped the merge window for 3.6-rc1 for the tty tree,
  everything is now settled down and working properly, so we are ready
  for 3.7-rc1.  Here's the patchset, it's big, but the large changes are
  removing a firmware file and adding a staging tty driver (it depended
  on the tty core changes, so it's going through this tree instead of
  the staging tree.)

  All of these patches have been in the linux-next tree for a while.

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

Fix up more-or-less trivial conflicts in
 - drivers/char/pcmcia/synclink_cs.c:
    tty NULL dereference fix vs tty_port_cts_enabled() helper function
 - drivers/staging/{Kconfig,Makefile}:
    add-add conflict (dgrp driver added close to other staging drivers)
 - drivers/staging/ipack/devices/ipoctal.c:
    "split ipoctal_channel from iopctal" vs "TTY: use tty_port_register_device"

* tag 'tty-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (235 commits)
  tty/serial: Add kgdb_nmi driver
  tty/serial/amba-pl011: Quiesce interrupts in poll_get_char
  tty/serial/amba-pl011: Implement poll_init callback
  tty/serial/core: Introduce poll_init callback
  kdb: Turn KGDB_KDB=n stubs into static inlines
  kdb: Implement disable_nmi command
  kernel/debug: Mask KGDB NMI upon entry
  serial: pl011: handle corruption at high clock speeds
  serial: sccnxp: Make 'default' choice in switch last
  serial: sccnxp: Remove mask termios caps for SW flow control
  serial: sccnxp: Report actual baudrate back to core
  serial: samsung: Add poll_get_char & poll_put_char
  Powerpc 8xx CPM_UART setting MAXIDL register proportionaly to baud rate
  Powerpc 8xx CPM_UART maxidl should not depend on fifo size
  Powerpc 8xx CPM_UART too many interrupts
  Powerpc 8xx CPM_UART desynchronisation
  serial: set correct baud_base for EXSYS EX-41092 Dual 16950
  serial: omap: fix the reciever line error case
  8250: blacklist Winbond CIR port
  8250_pnp: do pnp probe before legacy probe
  ...
2012-10-01 12:26:52 -07:00
..
DefaultKeyAssignments
Kconfig
Makefile Staging: speakup: Makefile: Makefile clean up 2010-10-08 07:26:24 -07:00
TODO
buffers.c BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
devsynth.c drivers/staging/speakup/devsynth.c: fix "buffer size is not provably correct" error 2011-08-02 16:09:46 -07:00
fakekey.c fakekey: Simplify speakup_fake_key_pressed through this_cpu_ops 2010-12-17 15:07:19 +01:00
i18n.c staging: speakup: i18n.c: Fix leak in msg_set() 2012-08-13 19:32:13 -07:00
i18n.h
keyhelp.c Fix common misspellings 2011-03-31 11:26:23 -03:00
kobjects.c Staging: speakup: Use kmemdup rather than duplicating its implementation 2011-11-26 18:12:56 -08:00
main.c Staging: speakup: fix an improperly-declared variable. 2012-06-18 17:13:06 -07:00
selection.c staging: speakup: fixed checkpatch and sparse warnings in selection.c 2012-06-13 12:20:16 -07:00
serialio.c TTY: speakup, do not use serialP 2012-03-08 11:47:02 -08:00
serialio.h serial: diminish usage of struct serial_uart_config 2012-09-05 13:15:07 -07:00
speakup.h module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
speakup_acnt.h staging "speakup" Fix typos. 2012-07-09 13:06:21 -07:00
speakup_acntpc.c staging: speakup: speakup_acntpc.c: style fixes 2010-10-15 12:22:35 -07:00
speakup_acntsa.c staging: speakup: speakup_acntsa.c: style fixes 2010-10-15 12:22:35 -07:00
speakup_apollo.c staging: speakup: speakup_apollo.c: style fixes 2010-10-15 12:22:35 -07:00
speakup_audptr.c staging: speakup: speakup_audptr.c: style fixes 2010-10-15 12:22:36 -07:00
speakup_bns.c staging: speakup: speakup_bns.c: style fixes 2010-10-15 12:22:36 -07:00
speakup_decext.c staging: speakup: speakup_decext.c: style fixes 2010-10-15 12:22:36 -07:00
speakup_decpc.c staging "speakup" Fix typos. 2012-07-09 13:06:21 -07:00
speakup_dectlk.c staging: speakup: speakup_dectlk.c: style fixes 2010-10-15 12:22:38 -07:00
speakup_dtlk.c staging: speakup: speakup_dtlk.c: style fixes 2010-10-15 12:22:36 -07:00
speakup_dtlk.h
speakup_dummy.c staging: speakup: speakup_dummy.c: style fixes 2010-10-15 12:22:37 -07:00
speakup_keypc.c staging: speakup: speakup_keypc.c: style fixes 2010-10-15 12:22:37 -07:00
speakup_ltlk.c staging: speakup: speakup_ltlk.c: style fixes 2010-10-15 12:22:37 -07:00
speakup_soft.c staging: speakup_soft: Fix reading of init string 2012-09-17 05:32:50 -07:00
speakup_spkout.c staging: speakup: speakup_spkout.c: style fixes 2010-10-15 12:22:38 -07:00
speakup_txprt.c staging: speakup: speakup_txprt.c: style fixes 2010-10-15 12:22:38 -07:00
speakupmap.h
speakupmap.map
spk_priv.h TTY: speakup, do not use serialP 2012-03-08 11:47:02 -08:00
spk_priv_keyinfo.h staging: speakup: enlosed macros with complex values in parenthesis 2011-02-04 13:01:02 -08:00
spk_types.h staging: speakup: enlosed macros with complex values in parenthesis 2011-02-04 13:01:02 -08:00
spkguide.txt Fix common misspellings 2011-03-31 11:26:23 -03:00
synth.c staging "speakup" Fix typos. 2012-07-09 13:06:21 -07:00
thread.c staging: speakup: thread.c style fixes 2010-10-19 10:06:05 -07:00
varhandlers.c staging: speakup: varhandlers.c style fixes 2010-10-19 10:06:05 -07:00