leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
98793265b4
linux/drivers/staging/iio
History
Linus Torvalds 98793265b4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)
  Kconfig: acpi: Fix typo in comment.
  misc latin1 to utf8 conversions
  devres: Fix a typo in devm_kfree comment
  btrfs: free-space-cache.c: remove extra semicolon.
  fat: Spelling s/obsolate/obsolete/g
  SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
  tools/power turbostat: update fields in manpage
  mac80211: drop spelling fix
  types.h: fix comment spelling for 'architectures'
  typo fixes: aera -> area, exntension -> extension
  devices.txt: Fix typo of 'VMware'.
  sis900: Fix enum typo 'sis900_rx_bufer_status'
  decompress_bunzip2: remove invalid vi modeline
  treewide: Fix comment and string typo 'bufer'
  hyper-v: Update MAINTAINERS
  treewide: Fix typos in various parts of the kernel, and fix some comments.
  clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
  gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
  leds: Kconfig: Fix typo 'D2NET_V2'
  sound: Kconfig: drop unknown symbol ARCH_CLPS7500
  ...

Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)
2012-01-08 13:21:22 -08:00
..
accel staging:iio: Use module_spi_driver to register SPI driver 2011-11-17 12:15:40 -08:00
adc Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2012-01-08 12:19:57 -08:00
addac staging:iio: Use module_spi_driver to register SPI driver 2011-11-17 12:15:40 -08:00
cdc staging:iio: Use module_i2c_driver to register I2C drivers 2011-11-17 12:15:39 -08:00
dac Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2012-01-08 12:19:57 -08:00
dds Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2012-01-08 12:19:57 -08:00
Documentation staging:iio:Documentation gyro -> anglvel updates in attribute names 2011-10-05 13:47:47 -07:00
gyro staging:iio: Use module_spi_driver to register SPI driver 2011-11-17 12:15:40 -08:00
impedance-analyzer staging:iio: Use module_i2c_driver to register I2C drivers 2011-11-17 12:15:39 -08:00
imu staging:iio: Use module_spi_driver to register SPI driver 2011-11-17 12:15:40 -08:00
light staging:iio: Use module_i2c_driver to register I2C drivers 2011-11-17 12:15:39 -08:00
magnetometer staging:iio: Use module_i2c_driver to register I2C drivers 2011-11-17 12:15:39 -08:00
meter staging:iio: Use module_spi_driver to register SPI driver 2011-11-17 12:15:40 -08:00
resolver staging:iio: Use module_spi_driver to register SPI driver 2011-11-17 12:15:40 -08: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 staging:iio:events - new 64 bit code structure and push out drivers. 2011-09-06 16:02:00 -07:00
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: Add export.h for THIS_MODULE/EXPORT_SYMBOL to drivers/staging users. 2011-10-31 19:32:08 -04: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: Add export.h for THIS_MODULE/EXPORT_SYMBOL to drivers/staging users. 2011-10-31 19:32:08 -04:00
industrialio-core.c iio: iio_event_getfd -- fix ev_int build failure 2011-11-26 13:23:49 -08:00
industrialio-trigger.c treewide: Fix typos in various parts of the kernel, and fix some comments. 2011-12-02 14:57:31 +01:00
Kconfig iio: adc: Relocate Capacitance to Digital Converters (CDC) into own subdir 2011-10-19 13:55:43 -07:00
kfifo_buf.c staging:iio: replacing term ring with buffer in the IIO core. 2011-09-26 17:31:53 -07:00
kfifo_buf.h staging:iio: replacing term ring with buffer in the IIO core. 2011-09-26 17:31:53 -07:00
Makefile iio: adc: Relocate Capacitance to Digital Converters (CDC) into own subdir 2011-10-19 13:55:43 -07:00
ring_hw.h staging:iio: replacing term ring with buffer in the IIO core. 2011-09-26 17:31:53 -07:00
ring_sw.c staging:iio: replacing term ring with buffer in the IIO core. 2011-09-26 17:31:53 -07:00
ring_sw.h staging:iio: replacing term ring with buffer in the IIO core. 2011-09-26 17:31:53 -07:00
sysfs.h staging:iio:tree wide. abi fixup for in_ out_ prefix introduction. 2011-09-16 20:32:00 +02:00
TODO staging: iio: add ADI info to TODO 2010-11-09 15:46:32 -08:00
trigger_consumer.h staging:iio: treewide rename iio_triggered_ring_* to iio_triggered_buffer_* 2011-09-26 17:31:52 -07:00
trigger.h treewide: use __printf not __attribute__((format(printf,...))) 2011-10-31 17:30:54 -07:00