diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-21 05:44:53 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-21 05:44:53 +0200 |
commit | b7a68369ea81dfae1416aadf722d830c14ba97c7 (patch) | |
tree | f90cba0d0d82bae2f8e8311a6c9ad7d56fd36134 /Makefile | |
parent | Merge tag 'usb-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gre... (diff) | |
parent | Merge tag 'iio-fixes-for-3.16d' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
download | linux-b7a68369ea81dfae1416aadf722d830c14ba97c7.tar.xz linux-b7a68369ea81dfae1416aadf722d830c14ba97c7.zip |
Merge tag 'staging-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull more IIO driver fixes from Greg KH:
"Here are two IIO driver fixes for 3.16-rc6 that resolve some reported
issues"
* tag 'staging-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
iio: mma8452: Use correct acceleration units.
iio:core: Handle error when mask type is not separate
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions