leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
99759619b2
linux/drivers/s390/char
History
Linus Torvalds e6bee325e4 Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (76 commits)
  pch_uart: reference clock on CM-iTC
  pch_phub: add new device ML7213
  n_gsm: fix UIH control byte : P bit should be 0
  n_gsm: add a documentation
  serial: msm_serial_hs: Add MSM high speed UART driver
  tty_audit: fix tty_audit_add_data live lock on audit disabled
  tty: move cd1865.h to drivers/staging/tty/
  Staging: tty: fix build with epca.c driver
  pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()
  Staging: generic_serial: fix double locking bug
  nozomi: don't use flush_scheduled_work()
  tty/serial: Relax the device_type restriction from of_serial
  MAINTAINERS: Update HVC file patterns
  tty: phase out of ioctl file pointer for tty3270 as well
  tty: forgot to remove ipwireless from drivers/char/pcmcia/Makefile
  pch_uart: Fix DMA channel miss-setting issue.
  pch_uart: fix exclusive access issue
  pch_uart: fix auto flow control miss-setting issue
  pch_uart: fix uart clock setting issue
  pch_uart : Use dev_xxx not pr_xxx
  ...

Fix up trivial conflicts in drivers/misc/pch_phub.c (same patch applied
twice, then changes to the same area in one branch)
2011-03-16 15:11:04 -07:00
..
con3215.c [S390] 3215: add support for irq statistics 2011-01-05 12:47:25 +01:00
con3270.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
ctrlchar.c Input: sysrq - drop tty argument form handle_sysrq() 2010-08-21 00:34:45 -07:00
ctrlchar.h
defkeymap.c Build fix for drivers/s390/char/defkeymap.c 2008-03-04 08:01:26 -08:00
defkeymap.map
fs3270.c BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
Kconfig [S390] cleanup s390 Kconfig 2011-01-05 12:47:23 +01:00
keyboard.c Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 2011-03-16 15:11:04 -07:00
keyboard.h tty: phase out of ioctl file pointer for tty3270 as well 2011-02-25 09:56:13 -08:00
Makefile [S390] add call home support 2009-09-11 10:29:49 +02:00
monreader.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
monwriter.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
raw3270.c [S390] 3270: add support for irq statistics 2011-01-05 12:47:25 +01:00
raw3270.h [S390] pm: con3270 power management callbacks. 2009-06-16 10:31:20 +02:00
sclp_async.c [S390] sclp_async: potential buffer overflow 2010-04-09 13:43:02 +02:00
sclp_cmd.c [S390] sclp: avoid 64 bit division 2010-03-24 11:49:53 +01:00
sclp_con.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
sclp_config.c [S390] prevent unneccesary loops_per_jiffy recalculation 2011-01-05 12:47:32 +01:00
sclp_cpi_sys.c Fix typos in comments 2010-03-16 11:47:56 +01:00
sclp_cpi_sys.h
sclp_cpi.c
sclp_quiesce.c [S390] sclp: undo quiesce handler override on resume 2009-11-13 15:45:03 +01:00
sclp_rw.c [S390] pm: power management support for SCLP drivers. 2009-06-16 10:31:16 +02:00
sclp_rw.h [S390] sclp: fix compile error for !SCLP_CONSOLE 2009-07-07 16:37:50 +02:00
sclp_sdias.c [S390] convert sclp printks to pr_xxx macros. 2008-12-25 13:39:24 +01:00
sclp_tty.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
sclp_tty.h [S390] sclp_tty: remove ioctl interface. 2008-07-14 10:02:25 +02:00
sclp_vt220.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
sclp.c [S390] sclp: use register_external_interrupt() 2011-01-05 12:47:26 +01:00
sclp.h [S390] add call home support 2009-09-11 10:29:49 +02:00
tape_34xx.c [S390] tape: deadlock on system work queue 2011-03-03 17:56:14 +01:00
tape_3590.c [S390] tape: deadlock on system work queue 2011-03-03 17:56:14 +01:00
tape_3590.h
tape_block.c s390: don't use flush_scheduled_work() 2010-12-24 16:00:18 +01:00
tape_char.c BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
tape_class.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
tape_class.h headers: kobject.h redux 2011-01-10 08:51:44 -08:00
tape_core.c [S390] tape: add support for irq statistics 2011-01-05 12:47:25 +01:00
tape_proc.c [S390] tape: Add pr_fmt() macro to all tape source files 2009-12-18 17:43:32 +01:00
tape_std.c [S390] tape: fix dbf usage 2010-10-29 16:50:50 +02:00
tape_std.h
tape.h [S390] tape: deadlock on system work queue 2011-03-03 17:56:14 +01:00
tty3270.c tty: phase out of ioctl file pointer for tty3270 as well 2011-02-25 09:56:13 -08:00
tty3270.h
vmcp.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
vmcp.h
vmlogrdr.c BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
vmur.c [S390] vmur: add support for irq statistics 2011-01-05 12:47:26 +01:00
vmur.h [S390] vmur: Use wait queue instead of mutex to serialize open 2008-04-17 07:46:59 +02:00
vmwatchdog.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
zcore.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00