Greg Kroah-Hartman 8f5f90a872 Merge 3.8-rc5 into staging-next ...

This resolves a merge issue with a iio driver, and the zram code.

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

2013-01-25 21:25:02 -08:00

..

accel

Merge 3.8-rc5 into staging-next

2013-01-25 21:25:02 -08:00

adc

Merge 3.8-rc5 into staging-next

2013-01-25 21:25:02 -08:00

amplifiers

Drivers: iio: remove __dev* attributes.

2013-01-03 15:57:03 -08:00

common

Merge branch 'staging-linus' into staging-next

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

dac

Merge tag 'staging-3.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

2013-01-14 09:08:38 -08:00

frequency

Merge tag 'staging-3.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

2013-01-14 09:08:38 -08:00

gyro

Merge 3.8-rc5 into staging-next

2013-01-25 21:25:02 -08:00

imu

iio: imu: adis16480: remove duplicated include from adis16480.c

2012-11-30 13:11:46 +00:00

light

Merge 3.8-rc5 into staging-next

2013-01-25 21:25:02 -08:00

magnetometer

Merge 3.8-rc5 into staging-next

2013-01-25 21:25:02 -08:00

buffer_cb.c

staging:iio: add a callback buffer for in kernel push interface

2012-11-10 10:17:27 +00:00

iio_core_trigger.h

IIO: Move the core files to drivers/iio

2012-04-25 11:11:38 -07:00

iio_core.h

IIO: Move the core files to drivers/iio

2012-04-25 11:11:38 -07:00

industrialio-buffer.c

staging:iio: Add support for multiple buffers

2012-11-10 10:17:21 +00:00

industrialio-core.c

iio: Factor out fixed point number parsing into its own function

2012-11-20 21:26:39 +00:00

industrialio-event.c

drivers/iio/industrialio-event.c: eliminate possible double free

2012-11-17 10:17:20 +00:00

industrialio-trigger.c

iio:trigger: Register sysfs file statically

2012-07-08 10:39:58 +01:00

industrialio-triggered-buffer.c

iio: Add helper function for initializing triggered buffers

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

inkern.c

staging:iio:in kernel users: Add a data field for channel specific info.

2012-11-10 10:17:27 +00:00

Kconfig

staging:iio: Move adis library out of staging

2012-11-19 22:22:12 +00:00

kfifo_buf.c

iio: Drop timestamp parameter from buffer store_to callback

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

Makefile

staging:iio: Move adis library out of staging

2012-11-19 22:22:12 +00:00