diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-09 23:11:07 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-09 23:11:07 +0100 |
commit | 86a7a1676a5a34082470869178d2e5fe54f5c3b9 (patch) | |
tree | 32fac298ecebe48e119855c2d9742c9f5b4baff7 /drivers/spi/spi-fsl-cpm.c | |
parent | Merge tag 'tty-3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gre... (diff) | |
parent | Merge tag 'iio-fixes-for-3.18b' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
download | linux-86a7a1676a5a34082470869178d2e5fe54f5c3b9.tar.xz linux-86a7a1676a5a34082470869178d2e5fe54f5c3b9.zip |
Merge tag 'staging-3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver fixes from Greg KH:
"Here are some staging/iio fixes for 3.18-rc4.
Nothing major, just a few bugfixes of things that have been reported"
* tag 'staging-3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging:iio:ade7758: Remove "raw" from channel name
staging:iio:ade7758: Fix check if channels are enabled in prenable
staging:iio:ade7758: Fix NULL pointer deref when enabling buffer
iio: as3935: allocate correct iio_device size
io: accel: kxcjk-1013: Fix iio_event_spec direction
iio: tsl4531: Fix compiler error when CONFIG_PM_OPS is not defined
iio: adc: mxs-lradc: Disable the clock on probe failure
iio: st_sensors: Fix buffer copy
staging:iio:ad5933: Drop "raw" from channel names
staging:iio:ad5933: Fix NULL pointer deref when enabling buffer
Diffstat (limited to 'drivers/spi/spi-fsl-cpm.c')
0 files changed, 0 insertions, 0 deletions