Greg Kroah-Hartman cb1f6268ac Merge 3.7-rc3 into staging-next ...

This resolves the conflict with:
	drivers/staging/comedi/drivers/amplc_dio200.c
and syncs up the changes that happened in the staging directory for
3.7-rc3.

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

2012-10-29 08:37:12 -07:00

..

adc

iio:adc: Add common code for ADI Sigma Delta devices

2012-08-27 17:53:12 +01:00

dac

iio: add mcp4725 I2C DAC driver

2012-06-12 14:50:51 -07:00

frequency

iio: frequency: ADF4350: Fix potential reference div factor overflow.

2012-08-16 20:24:33 +01:00

buffer.h

iio: Drop timestamp parameter from buffer store_to callback

2012-09-08 10:14:34 +01:00

consumer.h

iio:inkern: Add function to read the processed value

2012-09-17 21:48:51 +01:00

driver.h

…

events.h

iio: iio/events.h typos

2012-06-15 14:39:19 -07:00

iio.h

iio: Add some helper macros for unit conversion

2012-10-19 16:12:38 +01:00

kfifo_buf.h

iio: Add missing include guards to headers

2012-08-27 18:57:56 +01:00

machine.h

iio: Add missing include guards to headers

2012-08-27 18:57:56 +01:00

sysfs.h

iio: correct documentation for IIO_CONST_ATTR_SAMP_FREQ_AVAIL, match name of #define

2012-06-18 17:31:42 -07:00

trigger_consumer.h

iio:trigger_consumer.h: Add missing includes and forward declarations

2012-08-27 18:57:59 +01:00

trigger.h

iio: whitespace cleanup and removal of semicolon after functions

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

triggered_buffer.h

iio: Add helper function for initializing triggered buffers

2012-06-18 17:26:09 -07:00

types.h

iio: Add a logarithmic fractional value type

2012-10-19 18:46:51 +01:00