Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-24 03:42:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
ff4b8a57f0
linux/drivers/staging/iio
History
Greg Kroah-Hartman ff4b8a57f0 Merge branch 'driver-core-next' into Linux 3.2 
This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.

The microcode_core.c patch was provided by Stephen Rothwell
<sfr@canb.auug.org.au> who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2012-01-06 11:42:52 -08:00
..
accel staging:iio: Use module_spi_driver to register SPI driver 2011-11-17 12:15:40 -08:00
adc staging:iio: Use module_spi_driver to register SPI driver 2011-11-17 12:15:40 -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 staging:iio: Use module_spi_driver to register SPI driver 2011-11-17 12:15:40 -08:00
dds staging:iio: Use module_spi_driver to register SPI driver 2011-11-17 12:15:40 -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 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 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