diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-09 13:43:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-09 13:43:12 -0800 |
| commit | df3865f8f56879b7e9f0ca47fa7bc5f2252df6d3 (patch) | |
| tree | d935d1bf5e0029499fbad5588f9d887d516cf786 /MAINTAINERS | |
| parent | e8b50608f666cf5c314a9df3dc4b85789a6aeaa5 (diff) | |
| parent | 13c80dda84c4c0c0f52f8dc2e8f083ca3ccc2aa0 (diff) | |
| download | linux-df3865f8f56879b7e9f0ca47fa7bc5f2252df6d3.tar.bz2 | |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"One PM related driver bugfix and a MAINTAINERS update"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
MAINTAINERS: Update the ocores i2c bus driver maintainer, etc
i2c: omap: Use noirq system sleep pm ops to idle device for suspend
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6a6d2f39ded1..9919840d54cd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11312,10 +11312,12 @@ F: include/dt-bindings/ OPENCORES I2C BUS DRIVER M: Peter Korsgaard <peter@korsgaard.com> +M: Andrew Lunn <andrew@lunn.ch> L: linux-i2c@vger.kernel.org S: Maintained F: Documentation/i2c/busses/i2c-ocores F: drivers/i2c/busses/i2c-ocores.c +F: include/linux/platform_data/i2c-ocores.h OPENRISC ARCHITECTURE M: Jonas Bonn <jonas@southpole.se> |