alistair23-linux/drivers/staging/iio
Linus Torvalds df9b29d13e Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (28 commits)
  staging: usbip: bugfix for isochronous packets and optimization
  staging: usbip: bugfix add number of packets for isochronous frames
  staging: usbip: bugfixes related to kthread conversion
  staging: usbip: fix shutdown problems.
  staging: hv: Fix GARP not sent after Quick Migration
  staging: IIO: IMU: ADIS16400: Avoid using printk facility directly
  staging: IIO: IMU: ADIS16400: Fix product ID check, skip embedded revision number
  staging: IIO: IMU: ADIS16400: Make sure only enabled scan_elements are pushed into the ring
  staging: IIO: IMU: ADIS16400: Fix addresses of GYRO and ACCEL calibration offset
  staging: IIO: IMU: ADIS16400: Add delay after self test
  staging: IIO: IMU: ADIS16400: Fix up SPI messages cs_change behavior
  staging/rtl81*: build as loadable modules only
  staging: brcm80211: removed 'is_amsdu causing toss' log spam
  staging: brcm80211: fix for 'Short CCK' log spam
  staging: brcm80211: fix for 'AC_BE txop..' logs spammed problem
  staging: memrar: remove driver from tree
  staging: sep: remove last memrar remnants
  staging: fix hv_mouse build, needs delay.h
  staging: fix olpc_dcon build errors
  staging: sm7xx: fixed defines
  ...

Fix up trivial conflict in drivers/staging/memrar/memrar_handler.c
(deleted vs trivial spelling fixes)
2011-04-07 11:36:44 -07:00
..
accel Fix common misspellings 2011-03-31 11:26:23 -03:00
adc Fix common misspellings 2011-03-31 11:26:23 -03:00
addac staging: iio: new ADT7316/7/8 and ADT7516/7/9 driver 2010-11-09 15:46:34 -08:00
dac Staging: IIO: DAC: AD5624R: Consistency cleanup - no functional changes 2011-03-14 12:21:28 -07:00
dds Staging: IIO: DDS: AD9832 / AD9835 driver 2011-02-09 14:58:57 -08:00
Documentation Fix common misspellings 2011-03-31 11:26:23 -03:00
gyro Fix common misspellings 2011-03-31 11:26:23 -03:00
imu Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
light staging: iio: light remove empty light.h file 2010-10-08 07:17:56 -07:00
magnetometer Revert "staging: iio: ak8975: add platform data." 2011-02-23 14:12:25 -08:00
meter Fix common misspellings 2011-03-31 11:26:23 -03:00
resolver Staging: iio: fix up world writable sysfs files. 2010-12-10 10:56:18 -08:00
trigger staging: IIO: trigger: New Blackfin specific trigger driver iio-trig-bfin-timer 2011-02-23 14:40:04 -08:00
chrdev.h Fix common misspellings 2011-03-31 11:26:23 -03:00
iio.h Fix common misspellings 2011-03-31 11:26:23 -03:00
industrialio-core.c Fix common misspellings 2011-03-31 11:26:23 -03:00
industrialio-ring.c staging:iio:buffering move the copy to user on rip down into implementations 2011-02-18 13:22:50 -08:00
industrialio-trigger.c staging: iio: remove timestamp field from trigger and pass instead through pollfuncs 2010-07-22 11:38:28 -07:00
Kconfig staging:iio:kfifo buffer implementation 2011-02-18 13:22:51 -08:00
kfifo_buf.c staging:iio:kfifo buffer implementation 2011-02-18 13:22:51 -08:00
kfifo_buf.h staging:iio:kfifo buffer implementation 2011-02-18 13:22:51 -08:00
Makefile staging:iio:kfifo buffer implementation 2011-02-18 13:22:51 -08:00
ring_generic.h Fix common misspellings 2011-03-31 11:26:23 -03:00
ring_hw.h Staging: IIO: VTI sca3000 series accelerometer driver (spi) 2009-09-15 12:02:24 -07:00
ring_sw.c staging:iio:buffering move the copy to user on rip down into implementations 2011-02-18 13:22:50 -08:00
ring_sw.h staging:iio:buffering move the copy to user on rip down into implementations 2011-02-18 13:22:50 -08:00
sysfs.h Staging: iio: fix up world writable sysfs files. 2010-12-10 10:56:18 -08:00
TODO staging: iio: add ADI info to TODO 2010-11-09 15:46:32 -08:00
trigger.h staging: iio: lis3l02dqbuffersimple.c bring example up to date. 2010-09-04 21:19:02 -07:00
trigger_consumer.h Staging: iio: Staticise non-exported functions 2010-03-03 16:43:02 -08:00