diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-04 20:26:18 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-04 20:26:18 +0100 |
| commit | 91aff98b79f10bf38c0d51b2d8538ecca35f916e (patch) | |
| tree | 32236b647c22c9f3f05d52d1ece14a88b920653c /MAINTAINERS | |
| parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert... (diff) | |
| parent | staging: fsl-mc: fix warning in DT ranges parser (diff) | |
| download | linux-91aff98b79f10bf38c0d51b2d8538ecca35f916e.tar.xz linux-91aff98b79f10bf38c0d51b2d8538ecca35f916e.zip | |
Merge tag 'staging-4.11-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging/IIO driver fixes from Greg KH:
"Here are a few small staging and IIO driver fixes for issues that
showed up after the big set if changes you merged last week.
Nothing major, just small bugs resolved in some IIO drivers, a lustre
allocation fix, and some RaspberryPi driver fixes for reported
problems, as well as a MAINTAINERS entry update.
All of these have been in linux-next for a week with no reported
issues"
* tag 'staging-4.11-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: fsl-mc: fix warning in DT ranges parser
MAINTAINERS: Remove Noralf Trønnes as fbtft maintainer
staging: vchiq_2835_arm: Make cache-line-size a required DT property
staging: bcm2835/mmal-vchiq: unlock on error in buffer_from_host()
staging/lustre/lnet: Fix allocation size for sv_cpt_data
iio: adc: xilinx: Fix error handling
iio: 104-quad-8: Fix off-by-one error when addressing flag register
iio: adc: handle unknow of_device_id data
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6f68cefa11e2..fa0e8da55f18 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5034,7 +5034,6 @@ F: lib/fault-inject.c FBTFT Framebuffer drivers M: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -M: Noralf Trønnes <noralf@tronnes.org> S: Maintained F: drivers/staging/fbtft/ |