leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
71e3335d55
linux/drivers/staging/iio
History
Greg Kroah-Hartman 949c3676cd Staging: Merge branch 'staging-next' into 2.6.38-rc3 
This was done to resolve conflicts in the following files due
to patches in Linus's tree and in the staging-next tree:
	drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
	drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-02 13:35:58 -08:00
..
accel Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
adc Staging: Merge branch 'staging-next' into 2.6.38-rc3 2011-02-02 13:35:58 -08:00
addac staging: iio: new ADT7316/7/8 and ADT7516/7/9 driver 2010-11-09 15:46:34 -08:00
dac Staging: Merge branch 'staging-next' into 2.6.38-rc3 2011-02-02 13:35:58 -08:00
dds Staging: IIO: DDS: AD9833 / AD9834 driver 2010-12-16 12:23:03 -08:00
Documentation Staging: iio: add driver for MAX517/518/519 2011-01-21 12:20:56 -08:00
gyro staging: iio: adis16260 add suppport for adis16255 and adis16250. 2010-11-29 11:04:48 -08:00
imu staging: iio: adis16350: add missing reference to temp offset 2010-11-09 15:46:31 -08: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
meter staging: iio: meter: new driver for ADE7854/58/68/78 devices 2010-11-09 15:46:43 -08:00
resolver Staging: iio: fix up world writable sysfs files. 2010-12-10 10:56:18 -08: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: resolver: new driver for AD2S90 devices 2010-11-09 15:46:44 -08:00
Makefile staging: iio: resolver: new driver for AD2S90 devices 2010-11-09 15:46:44 -08: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: fix up world writable sysfs files. 2010-12-10 10:56:18 -08:00
TODO staging: iio: add ADI info to TODO 2010-11-09 15:46:32 -08: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