summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-05-06 00:49:38 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2014-05-06 00:49:38 +0200
commita1e74464ffddf47e9a18f99a54242122bfd0997b (patch)
tree5d5c0b0d86979e97282d50b807421b5a3549310a /include
parentMerge tag 'xtensa-next-20140503' of git://github.com/czankel/xtensa-linux (diff)
parentMerge tag 'iio-fixes-for-3.15b' of git://git.kernel.org/pub/scm/linux/kernel/... (diff)
downloadlinux-a1e74464ffddf47e9a18f99a54242122bfd0997b.tar.xz
linux-a1e74464ffddf47e9a18f99a54242122bfd0997b.zip
Merge tag 'staging-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging / iio fixes from Greg KH: "Here are some small IIO driver fixes for 3.15-rc4 that resolve some reported issues" * tag 'staging-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: iio: adc: Nothing in ADC should be a bool CONFIG iio: exynos_adc: use indio_dev->dev structure to handle child nodes iio:imu:mpu6050: Fixed segfault in Invensens MPU driver due to null dereference staging:iio:ad2s1200 fix missing parenthesis in a for statment.
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions