summaryrefslogtreecommitdiffstats
path: root/drivers/iio/inkern.c
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge 3.4-rc5 into staging-nextGreg Kroah-Hartman2012-05-021-0/+1
| | | | | | | 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/iioJonathan Cameron2012-04-251-0/+292
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>