linux

Commit Graph

Author	SHA1	Message	Date
Greg Kroah-Hartman	d210267741	Merge 3.4-rc5 into staging-next This resolves the conflict in: drivers/staging/vt6656/ioctl.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2012-05-02 11:48:07 -07:00
Jonathan Cameron	a980e04609	IIO: Move the core files to drivers/iio 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>	2012-04-25 11:11:38 -07:00

Author

SHA1

Message

Date

Greg Kroah-Hartman

d210267741

Merge 3.4-rc5 into staging-next

This resolves the conflict in:
	drivers/staging/vt6656/ioctl.c

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

2012-05-02 11:48:07 -07:00

Jonathan Cameron

a980e04609

IIO: Move the core files to drivers/iio

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>

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

2 Commits (da26848afa1111707cb740dbb826b4959f3424b5)