Greg Kroah-Hartman 829455bb0e Merge 3.10-rc3 into staging-next ...

We want the changes here, and we resolve the merge conflict that was
happening in the nvec_kbd.c file.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2013-05-27 10:54:33 +09:00

..

accel

Removal of GENERIC_GPIO for v3.10

2013-05-09 09:59:16 -07:00

adc

Merge 3.10-rc3 into staging-next

2013-05-27 10:54:33 +09:00

addac

Removal of GENERIC_GPIO for v3.10

2013-05-09 09:59:16 -07:00

cdc

staging:iio:cdc:ad7746 move to info_mask_(shared_by_type/separate)

2013-03-17 19:49:39 +00:00

Documentation

iio:trigger: Use dev_{set,get}_drvdata for private data management

2013-03-25 21:06:10 +00:00

frequency

staging:iio: Use spi_sync_transfer()

2013-02-09 11:10:43 +00:00

gyro

staging:iio:gyro:adis16130 move to info_mask_(shared_by_type/separate)

2013-03-17 19:49:40 +00:00

impedance-analyzer

staging:iio:impedance:ad5933 move to info_mask_(shared_by_type/separate)

2013-03-17 19:49:40 +00:00

light

staging:iio:light:tsl2x7x: fix the error handling in tsl2x7x_probe()

2013-05-22 22:14:57 +01:00

magnetometer

iio:magnetometer:ak8975 move driver out of staging

2013-04-02 18:36:47 +01:00

meter

iio:trigger: Introduce iio_tigger_{set,get}_drvdata

2013-03-25 21:06:09 +00:00

resolver

Removal of GENERIC_GPIO for v3.10

2013-05-09 09:59:16 -07:00

trigger

iio:trigger:sysfs Move out of staging.

2013-05-22 22:16:48 +01:00

iio_dummy_evgen.c

staging:iio: Don't compare boolean values with true/false

2012-10-19 16:19:45 +01: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

iio: Fix some comments

2012-12-27 11:21:28 +00:00

iio_simple_dummy_events.c

staging: iio: Fix typo in iio

2012-05-08 16:04:12 -07:00

iio_simple_dummy.c

staging:iio:dummy: Fix mismatch and export sysfs entry

2013-04-09 18:29:52 +01:00

iio_simple_dummy.h

staging:iio:dummy: Fix potential NULL pointer dereference

2012-09-22 10:55:08 +01:00

Kconfig

hwmon: Move the IIO client driver for hwmon out of staging

2013-03-23 10:08:15 +00:00

Makefile

hwmon: Move the IIO client driver for hwmon out of staging

2013-03-23 10:08:15 +00:00

ring_hw.h

staging:iio: Update email address for Jonathan Cameron.

2012-09-03 20:26:46 +01:00

TODO

staging:iio: Update email address for Jonathan Cameron.

2012-09-03 20:26:46 +01:00