Greg Kroah-Hartman 17cb3be61b Merge branch 'staging-linus' into staging-next ... This is to get the comedi fixes, and resolve the issue in comdi_test.c and comedi_fops.c that were caused by changes in both branches. It also allows the fwserial driver changes to be applied, as they required the fixes that are in staging-linus. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2013-01-07 15:17:52 -08:00
..
hid-sensors	Merge branch 'staging-linus' into staging-next	2013-01-07 15:17:52 -08:00
Kconfig	iio: hid-sensors: Common attribute and trigger	2012-09-06 19:20:11 +01:00
Makefile	iio: hid-sensors: Common attribute and trigger	2012-09-06 19:20:11 +01:00