Greg Kroah-Hartman 17cb3be61b Merge branch 'staging-linus' into staging-next ...

This is to get the comedi fixes, and resolve the issue in comdi_test.c
and comedi_fops.c that were caused by changes in both branches.

It also allows the fwserial driver changes to be applied, as they
required the fixes that are in staging-linus.

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

2013-01-07 15:17:52 -08:00

..

hid-sensor-attributes.c

hid: iio: rename struct hid_sensor_iio_common to hid_sensor_common

2013-01-06 11:48:11 +00:00

hid-sensor-trigger.c

hid: iio: rename struct hid_sensor_iio_common to hid_sensor_common

2013-01-06 11:48:11 +00:00

hid-sensor-trigger.h

hid: iio: rename struct hid_sensor_iio_common to hid_sensor_common

2013-01-06 11:48:11 +00:00

Kconfig

iio: hid-sensors: respect CONFIG_IIO_TRIGGER

2012-12-27 10:59:50 +00:00

Makefile

iio: hid-sensors: respect CONFIG_IIO_TRIGGER

2012-12-27 10:59:50 +00:00