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

..

adjd_s311.c

Drivers: iio: remove __dev* attributes.

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

hid-sensor-als.c

Merge 3.8-rc5 into staging-next

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

Kconfig

iio: hid-sensors: respect CONFIG_IIO_TRIGGER

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

lm3533-als.c

Drivers: iio: remove __dev* attributes.

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

Makefile

iio: hid-sensors: Added ALS

2012-09-06 19:24:15 +01:00

vcnl4000.c

Drivers: iio: remove __dev* attributes.

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