Greg Kroah-Hartman e4c5bf8e3d Merge 'staging-next' to Linus's tree ...

This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2010-10-28 09:44:56 -07:00

..

accel

staging: iio: adc add numbers to naming of all adc channels as needed to associate events with them.

2010-10-08 07:17:56 -07:00

adc

staging: iio: ad7476: fix !CONFIG_IIO_RING_BUFFER build issue reported by Randy Dunlap

2010-10-14 12:09:23 -07:00

Documentation

staging: iio: update example application.

2010-10-08 07:17:57 -07:00

gyro

staging: iio: adc add numbers to naming of all adc channels as needed to associate events with them.

2010-10-08 07:17:56 -07:00

imu

staging: iio: adc add numbers to naming of all adc channels as needed to associate events with them.

2010-10-08 07:17:56 -07:00

light

staging: iio: light remove empty light.h file

2010-10-08 07:17:56 -07:00

magnetometer

staging: iio: ak8975: Add ak8975 magnetometer sensor

2010-09-14 16:37:11 -07:00

trigger

staging: iio: Make use of the convenient IIO_TRIGGER_NAME_ATTR macro

2010-09-04 21:19:01 -07:00

chrdev.h

staging: iio: Remove long dead function definitions from headers

2010-09-04 21:19:00 -07:00

iio.h

staging: iio: convert idr to ida as pointer never provided

2010-09-04 21:18:59 -07:00

industrialio-core.c

Merge 'staging-next' to Linus's tree

2010-10-28 09:44:56 -07:00

industrialio-ring.c

Merge 'staging-next' to Linus's tree

2010-10-28 09:44:56 -07:00

industrialio-trigger.c

staging: iio: remove timestamp field from trigger and pass instead through pollfuncs

2010-07-22 11:38:28 -07:00

Kconfig

staging: iio: ring_sw Add select of triggers to avoid build issue.

2010-08-02 17:06:04 -07:00

Makefile

Staging: iio: add digital compass hmc5843 driver

2010-07-22 14:26:57 -07:00

ring_generic.h

staging: iio: ring_generic: provide IIO_CONST_ATTR_SCAN_EL_TYPE_WITH_SHIFT

2010-10-07 10:07:01 -07:00

ring_hw.h

Staging: IIO: VTI sca3000 series accelerometer driver (spi)

2009-09-15 12:02:24 -07:00

ring_sw.c

staging: iio move scan_elements into ring buffer

2010-08-31 11:42:02 -07:00

ring_sw.h

staging: iio rename ring attributes

2010-08-31 11:42:01 -07:00

sysfs.h

staging: iio: sca3000 event attribute name updates

2010-10-08 07:17:54 -07:00

TODO

Staging: iio: Add mailing list to the TODO file.

2010-06-18 13:14:33 -07:00

trigger_consumer.h

Staging: iio: Staticise non-exported functions

2010-03-03 16:43:02 -08:00

trigger.h

staging: iio: lis3l02dqbuffersimple.c bring example up to date.

2010-09-04 21:19:02 -07:00