linux-toradex.git/drivers/iio/inkern.c, branch v3.5-rc1 Linux kernel for Apalis and Colibri modules Merge 3.4-rc5 into staging-next 2012-05-02T18:48:07+00:00 Greg Kroah-Hartman gregkh@linuxfoundation.org 2012-05-02T18:48:07+00:00 d210267741fb2a8b6d741d9040703683a39087f4 This resolves the conflict in: drivers/staging/vt6656/ioctl.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
This resolves the conflict in:
	drivers/staging/vt6656/ioctl.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
IIO: Move the core files to drivers/iio 2012-04-25T18:11:38+00:00 Jonathan Cameron jic23@kernel.org 2012-04-25T14:54:59+00:00 a980e046098b0a40eaff5e4e7fcde6cf035b7c06 Take the core support + the kfifo buffer implentation out of staging. Whilst we are far from done in improving this subsystem it is now at a stage where the userspae interfaces (provided by the core) can be considered stable. Drivers will follow over a longer time scale. Signed-off-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
Take the core support + the kfifo buffer implentation out of
staging.  Whilst we are far from done in improving this subsystem
it is now at a stage where the userspae interfaces (provided by
the core) can be considered stable.

Drivers will follow over a longer time scale.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>