Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-25 12:21:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
e857bfd460
linux/drivers/staging/iio
History
Linus Torvalds aa77677e0a Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1519 commits)
  staging: et131x: Remove redundant check and return statement
  staging: et131x: Mainly whitespace changes to appease checkpatch
  staging: et131x: Remove last of the forward declarations
  staging: et131x: Remove even more forward declarations
  staging: et131x: Remove yet more forward declarations
  staging: et131x: Remove more forward declarations
  staging: et131x: Remove forward declaration of et131x_adapter_setup
  staging: et131x: Remove some forward declarations
  staging: et131x: Remove unused rx_ring.recv_packet_pool
  staging: et131x: Remove call to find pci pm capability
  staging: et131x: Remove redundant et131x_reset_recv() call
  staging: et131x: Remove unused rx_ring.recv_buffer_pool
  Staging: bcm: Fix three initialization errors in InterfaceDld.c
  Staging: bcm: Fix coding style issues in InterfaceDld.c
  staging:iio:dac: Add AD5360 driver
  staging:iio:trigger:bfin-timer: Fix compile error
  Staging: vt6655: add some range checks before memcpy()
  Staging: vt6655: whitespace fixes to iotcl.c
  Staging: vt6656: add some range checks before memcpy()
  Staging: vt6656: whitespace cleanups in ioctl.c
  ...

Fix up conflicts in:
 - drivers/{Kconfig,Makefile}, drivers/staging/{Kconfig,Makefile}:
	vg driver movement
 - drivers/staging/brcm80211/brcmfmac/{dhd_linux.c,mac80211_if.c}:
	driver removal vs now stale changes
 - drivers/staging/rtl8192e/r8192E_core.c:
	driver removal vs now stale changes
 - drivers/staging/et131x/et131*:
	driver consolidation into one file, tried to do fixups
2011-10-26 15:39:02 +02:00
..
accel staging:iio: fix removal path to allow correct freeing. 2011-10-17 15:34:53 -07:00
adc iio: adc: Relocate Capacitance to Digital Converters (CDC) into own subdir 2011-10-19 13:55:43 -07:00
addac Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2011-10-26 15:39:02 +02:00
cdc iio: cdc: Fix pushed event code - Typo, should be IIO_CAPACITANCE. 2011-10-19 13:55:44 -07:00
dac staging:iio:dac: Add AD5360 driver 2011-10-23 10:15:02 +02:00
dds Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2011-10-26 15:39:02 +02:00
Documentation staging:iio:Documentation gyro -> anglvel updates in attribute names 2011-10-05 13:47:47 -07:00
gyro staging:iio: fix removal path to allow correct freeing. 2011-10-17 15:34:53 -07:00
impedance-analyzer staging:iio: fix removal path to allow correct freeing. 2011-10-17 15:34:53 -07:00
imu staging:iio: fix removal path to allow correct freeing. 2011-10-17 15:34:53 -07:00
light staging:iio: fix removal path to allow correct freeing. 2011-10-17 15:34:53 -07:00
magnetometer staging:iio: fix removal path to allow correct freeing. 2011-10-17 15:34:53 -07:00
meter staging:iio: fix removal path to allow correct freeing. 2011-10-17 15:34:53 -07:00
resolver staging:iio: fix removal path to allow correct freeing. 2011-10-17 15:34:53 -07:00
trigger staging:iio:trigger:bfin-timer: Fix compile error 2011-10-23 10:15:02 +02:00
buffer_generic.h staging:iio:core:naming: dev_info to indio_dev for consistency 2011-10-11 09:58:58 -06:00
chrdev.h
iio_core_trigger.h staging:iio:core:naming: dev_info to indio_dev for consistency 2011-10-11 09:58:58 -06:00
iio_core.h staging:iio: Prevent reading from buffer chrdev when device has no buffer. 2011-09-26 17:31:56 -07:00
iio_dummy_evgen.c staging:iio:dummy Add event support + fake event generator 2011-10-17 15:36:30 -07:00
iio_dummy_evgen.h staging:iio:dummy Add event support + fake event generator 2011-10-17 15:36:30 -07:00
iio_simple_dummy_buffer.c staging:iio:dummy Add buffered reading support 2011-10-17 15:36:30 -07:00
iio_simple_dummy_events.c staging:iio:dummy Add event support + fake event generator 2011-10-17 15:36:30 -07:00
iio_simple_dummy.c staging:iio:dummy Add buffered reading support 2011-10-17 15:36:30 -07:00
iio_simple_dummy.h staging:iio:dummy Add buffered reading support 2011-10-17 15:36:30 -07:00
iio.h staging:iio:core:naming: dev_info to indio_dev for consistency 2011-10-11 09:58:58 -06:00
industrialio-buffer.c staging:iio:core:naming: dev_info to indio_dev for consistency 2011-10-11 09:58:58 -06:00
industrialio-core.c staging:iio: fix removal path to allow correct freeing. 2011-10-17 15:34:53 -07:00
industrialio-trigger.c staging:iio:core:naming: dev_info to indio_dev for consistency 2011-10-11 09:58:58 -06:00
Kconfig iio: adc: Relocate Capacitance to Digital Converters (CDC) into own subdir 2011-10-19 13:55:43 -07:00
kfifo_buf.c
kfifo_buf.h
Makefile iio: adc: Relocate Capacitance to Digital Converters (CDC) into own subdir 2011-10-19 13:55:43 -07:00
ring_hw.h
ring_sw.c
ring_sw.h
sysfs.h
TODO
trigger_consumer.h
trigger.h