diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-21 23:36:05 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-21 23:36:05 -0500 |
| commit | b0d81664a0092d8f6df7742b5aee6fcfd326b36c (patch) | |
| tree | 990e2b21b93d0bc8b0d7170bf121f06ac60f919d /MAINTAINERS | |
| parent | f8f5ed7c996ad9426847ce09b828d415cb19bc06 (diff) | |
| parent | 6ac2afb3f4601d74778a6ef76c50813a5b85b133 (diff) | |
Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
* 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
misc: ad525x_dpot: Fix AD8400 spi transfer size.
pch_phub: Fix MAC address writing issue for LAPIS ML7831
pch_phub: Improve ADE(Address Decode Enable) control
pch_phub: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor
pch_phub: Support new device LAPIS Semiconductor ML7831 IOH
pcie-gadget-spear: Add "platform:" prefix for platform modalias
MAINTAINERS: add CHAR and MISC driver maintainers
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 29f9948b2cc..165205be20f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1789,6 +1789,14 @@ F: include/net/cfg80211.h | |||
| 1789 | F: net/wireless/* | 1789 | F: net/wireless/* |
| 1790 | X: net/wireless/wext* | 1790 | X: net/wireless/wext* |
| 1791 | 1791 | ||
| 1792 | CHAR and MISC DRIVERS | ||
| 1793 | M: Arnd Bergmann <arnd@arndb.de> | ||
| 1794 | M: Greg Kroah-Hartman <greg@kroah.com> | ||
| 1795 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git | ||
| 1796 | S: Maintained | ||
| 1797 | F: drivers/char/* | ||
| 1798 | F: drivers/misc/* | ||
| 1799 | |||
| 1792 | CHECKPATCH | 1800 | CHECKPATCH |
| 1793 | M: Andy Whitcroft <apw@canonical.com> | 1801 | M: Andy Whitcroft <apw@canonical.com> |
| 1794 | S: Supported | 1802 | S: Supported |