kernel-fxtec-pro1x/drivers/staging/tty
Linus Torvalds 1f3a8e093f Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (970 commits)
  staging: usbip: replace usbip_u{dbg,err,info} and printk with dev_ and pr_
  staging:iio: Trivial kconfig reorganization and uniformity improvements.
  staging:iio:documenation partial update.
  staging:iio: use pollfunc allocation helpers in remaining drivers.
  staging:iio:max1363 misc cleanups and use of for_each_bit_set to simplify event code spitting out.
  staging:iio: implement an iio_info structure to take some of the constant elements out of iio_dev.
  staging:iio:meter:ade7758: Use private data space from iio_allocate_device
  staging:iio:accel:lis3l02dq make write_reg_8 take value not a pointer to value.
  staging:iio: ring core cleanups + check if read_last available in lis3l02dq
  staging:iio:core cleanup: squash tiny wrappers and use dev_set_name to handle creation of event interface name.
  staging:iio: poll func allocation clean up.
  staging:iio:ad7780 trivial unused header cleanup.
  staging:iio:adc: AD7780: Use private data space from iio_allocate_device + trivial fixes
  staging:iio:adc:AD7780: Convert to new channel registration method
  staging:iio:adc: AD7606: Drop dev_data in favour of iio_priv()
  staging:iio:adc: AD7606: Consitently use indio_dev
  staging:iio: Rip out helper for software rings.
  staging:iio:adc:AD7298: Use private data space from iio_allocate_device
  staging:iio: rationalization of different buffer implementation hooks.
  staging:iio:imu:adis16400 avoid allocating rx, tx, and state separately from iio_dev.
  ...

Fix up trivial conflicts in
 - drivers/staging/intel_sst/intelmid.c: patches applied in both branches
 - drivers/staging/rt2860/common/cmm_data_{pci,usb}.c: removed vs spelling
 - drivers/staging/usbip/vhci_sysfs.c: trivial header file inclusion
2011-05-23 12:49:28 -07:00
..
ip2 Fix common misspellings 2011-03-31 11:26:23 -03:00
cd1865.h Fix common misspellings 2011-03-31 11:26:23 -03:00
digi1.h Staging: tty: fix build with epca.c driver 2011-03-07 12:03:07 -08:00
digiFep1.h Staging: tty: fix build with epca.c driver 2011-03-07 12:03:07 -08:00
digiPCI.h Staging: tty: fix build with epca.c driver 2011-03-07 12:03:07 -08:00
epca.c Fix common misspellings 2011-03-31 11:26:23 -03:00
epca.h tty: move obsolete and broken tty drivers to drivers/staging/tty/ 2011-02-22 16:57:21 -08:00
epcaconfig.h tty: move obsolete and broken tty drivers to drivers/staging/tty/ 2011-02-22 16:57:21 -08:00
istallion.c staging: istallion: fix arbitrary kernel memory reads/writes 2011-04-25 16:45:22 -07:00
Kconfig tty: move obsolete and broken tty drivers to drivers/staging/tty/ 2011-02-22 16:57:21 -08:00
Makefile tty: move obsolete and broken tty drivers to drivers/staging/tty/ 2011-02-22 16:57:21 -08:00
riscom8.c tty: move obsolete and broken tty drivers to drivers/staging/tty/ 2011-02-22 16:57:21 -08:00
riscom8.h tty: move obsolete and broken tty drivers to drivers/staging/tty/ 2011-02-22 16:57:21 -08:00
riscom8_reg.h tty: move obsolete and broken tty drivers to drivers/staging/tty/ 2011-02-22 16:57:21 -08:00
serial167.c tty: move obsolete and broken tty drivers to drivers/staging/tty/ 2011-02-22 16:57:21 -08:00
specialix.c Revert wrong fixes for common misspellings 2011-04-26 23:31:11 -07:00
specialix_io8.h Fix common misspellings 2011-03-31 11:26:23 -03:00
stallion.c tty: move obsolete and broken tty drivers to drivers/staging/tty/ 2011-02-22 16:57:21 -08:00
TODO tty: move obsolete and broken tty drivers to drivers/staging/tty/ 2011-02-22 16:57:21 -08:00