diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-23 14:14:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-23 14:14:47 -0400 |
| commit | f5fc87905ea075a0b14878086fd4fe38be128844 (patch) | |
| tree | 09d7ad146b737caefb472534de95ef53f95d7e65 /MAINTAINERS | |
| parent | d4e06701b89286a306b31e20ec69a904fae374a1 (diff) | |
| parent | 90923351d480fffd0d24646db83f6f8315eed0d9 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
regulator: Convert tps65023 to use regmap API
regmap: Add SPI bus support
regmap: Add I2C bus support
regmap: Add generic non-memory mapped register access API
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 612316c352a2..63524a09ca86 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5327,6 +5327,13 @@ L: reiserfs-devel@vger.kernel.org | |||
| 5327 | S: Supported | 5327 | S: Supported |
| 5328 | F: fs/reiserfs/ | 5328 | F: fs/reiserfs/ |
| 5329 | 5329 | ||
| 5330 | REGISTER MAP ABSTRACTION | ||
| 5331 | M: Mark Brown <broonie@opensource.wolfsonmicro.com> | ||
| 5332 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git | ||
| 5333 | S: Supported | ||
| 5334 | F: drivers/base/regmap/ | ||
| 5335 | F: include/linux/regmap.h | ||
| 5336 | |||
| 5330 | RFKILL | 5337 | RFKILL |
| 5331 | M: Johannes Berg <johannes@sipsolutions.net> | 5338 | M: Johannes Berg <johannes@sipsolutions.net> |
| 5332 | L: linux-wireless@vger.kernel.org | 5339 | L: linux-wireless@vger.kernel.org |