openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/misc
History
Linus Torvalds 99dff58562 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: (48 commits)
  serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.
  tty/serial: Fix break handling for PORT_TEGRA
  tty/serial: Add explicit PORT_TEGRA type
  n_tracerouter and n_tracesink ldisc additions.
  Intel PTI implementaiton of MIPI 1149.7.
  Kernel documentation for the PTI feature.
  export kernel call get_task_comm().
  tty: Remove to support serial for S5P6442
  pch_phub: Support new device ML7223
  8250_pci: Add support for the Digi/IBM PCIe 2-port Adapter
  ASoC: Update cx20442 for TTY API change
  pch_uart: Support new device ML7223 IOH
  parport: Use request_muxed_region for IT87 probe and lock
  tty/serial: add support for Xilinx PS UART
  n_gsm: Use print_hex_dump_bytes
  drivers/tty/moxa.c: Put correct tty value
  TTY: tty_io, annotate locking functions
  TTY: serial_core, remove superfluous set_task_state
  TTY: serial_core, remove invalid test
  Char: moxa, fix locking in moxa_write
  ...

Fix up trivial conflicts in drivers/bluetooth/hci_ldisc.c and
drivers/tty/serial/Makefile.

I did the hci_ldisc thing as an evil merge, cleaning things up.
 		2011-05-23 12:23:20 -07:00
..
c2port Fix common misspellings 2011-03-31 11:26:23 -03:00
carma misc: Add CARMA DATA-FPGA Programmer support 2011-05-19 16:55:10 +10:00
cb710 misc: change to new flag variable 2011-03-17 14:05:34 +01:00
eeprom misc/at24: add more sanity checks for parameters 2010-12-24 02:14:17 -07:00
ibmasm Merge branch 'master' into for-next 2011-04-26 10:22:59 +02:00
iwmc3200top Fix common misspellings 2011-03-31 11:26:23 -03:00
lis3lv02d Move lis3lv02d drivers to drivers/misc 2011-03-21 17:59:36 +01:00
sgi-gru sanitize <linux/prefetch.h> usage 2011-05-20 12:50:29 -07:00
sgi-xp sgi-xpc: XPC fails to discover partitions with all nasids above 128 2010-11-25 06:50:40 +09:00
ti-st Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 2011-05-23 12:23:20 -07:00
Kconfig Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 2011-05-23 12:23:20 -07:00
Makefile Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 2011-05-23 12:23:20 -07:00
ab8500-pwm.c misc: Add ab8500 pwm driver 2010-10-29 00:29:21 +02:00
ad525x_dpot-i2c.c drivers/misc/ad525x_dpot.c: new features 2010-10-26 16:52:14 -07:00
ad525x_dpot-spi.c drivers/misc/ad525x_dpot.c: new features 2010-10-26 16:52:14 -07:00
ad525x_dpot.c drivers/misc/ad525x_dpot.c: new features 2010-10-26 16:52:14 -07:00
ad525x_dpot.h ad525x_dpot: use correct rdac channel for ad5251/ad5252 2010-10-26 16:52:14 -07:00
apds990x.c drivers/misc: driver for APDS990X ALS and proximity sensors 2010-10-26 16:52:14 -07:00
apds9802als.c drivers/misc/apds9802als.c: put the device into runtime suspend after resume()/probe() is handled 2011-03-22 17:44:10 -07:00
arm-charlcd.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
atmel-ssc.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
atmel_pwm.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
atmel_tclib.c drivers/misc/atmel_tclib.c: fix a memory leak 2011-03-22 17:44:11 -07:00
bh1770glc.c drivers/misc/bh1770glc.c: error handling in bh1770_power_state_store() 2010-11-12 07:55:31 -08:00
bh1780gli.c treewide: cleanup continuations and remove logging message whitespace 2011-04-26 10:24:37 +02:00
bmp085.c Fix common misspellings 2011-03-31 11:26:23 -03:00
cs5535-mfgpt.c cs5535: Fix section mismatch 2011-04-10 17:01:03 +02:00
ds1682.c sysfs: add struct file* to bin_attr callbacks 2010-05-21 09:37:31 -07:00
enclosure.c [SCSI] enclosure: fix error path - actually return ERR_PTR() on error 2010-07-27 12:03:48 -05:00
ep93xx_pwm.c drivers/misc/ep93xx_pwm.c: world-writable sysfs files 2011-03-22 17:44:11 -07:00
hmc6352.c drivers/misc/hmc6352.c: fix wrong return value checking for i2c_master_recv() 2011-03-22 17:44:10 -07:00
hpilo.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 2010-10-22 19:36:42 -07:00
hpilo.h hpilo: fix pointer warning in ilo_ccb_setup 2010-08-09 20:45:05 -07:00
ics932s401.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
ioc4.c ioc4: use static work_struct for ioc4_load_modules() 2010-12-24 16:14:20 +01:00
isl29003.c isl29003: fix resume functionality 2009-05-06 16:36:10 -07:00
isl29020.c drivers/misc/isl29020.c: remove incorrect kfree in isl29020_remove() 2010-11-25 06:50:47 +09:00
kgdbts.c Fix common misspellings 2011-03-31 11:26:23 -03:00
lkdtm.c lkdtm: prefix enum constants 2010-10-26 16:52:14 -07:00
pch_phub.c pch_phub: Support new device ML7223 2011-05-12 09:47:42 -07:00
phantom.c drivers/misc/phantom.c: add missing warning messages in phantom_probe() 2010-10-26 16:52:14 -07:00
pti.c Intel PTI implementaiton of MIPI 1149.7. 2011-05-13 16:31:00 -07:00
spear13xx_pcie_gadget.c treewide: cleanup continuations and remove logging message whitespace 2011-04-26 10:24:37 +02:00
ti_dac7512.c drivers/misc: add driver for Texas Instruments DAC7512 2009-12-15 08:53:25 -08:00
tifm_7xx1.c dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32) 2009-04-07 08:31:11 -07:00
tifm_core.c workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable' 2011-02-16 17:48:59 +01:00
tsl2550.c tsl2550: Move from i2c/chips to misc 2010-03-13 20:56:54 +01:00
vmw_balloon.c workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable' 2011-02-16 17:48:59 +01:00