diff options
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c3c52779fa6c..9c3a4f0280f6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2102,7 +2102,8 @@ M: khali@linux-fr.org | |||
2102 | P: Ben Dooks (embedded platforms) | 2102 | P: Ben Dooks (embedded platforms) |
2103 | M: ben-linux@fluff.org | 2103 | M: ben-linux@fluff.org |
2104 | L: linux-i2c@vger.kernel.org | 2104 | L: linux-i2c@vger.kernel.org |
2105 | T: quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ | 2105 | W: http://i2c.wiki.kernel.org/ |
2106 | T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ | ||
2106 | S: Maintained | 2107 | S: Maintained |
2107 | 2108 | ||
2108 | I2C-TINY-USB DRIVER | 2109 | I2C-TINY-USB DRIVER |
@@ -2841,8 +2842,6 @@ S: Maintained | |||
2841 | MAC80211 | 2842 | MAC80211 |
2842 | P: Johannes Berg | 2843 | P: Johannes Berg |
2843 | M: johannes@sipsolutions.net | 2844 | M: johannes@sipsolutions.net |
2844 | P: Michael Wu | ||
2845 | M: flamingice@sourmilk.net | ||
2846 | L: linux-wireless@vger.kernel.org | 2845 | L: linux-wireless@vger.kernel.org |
2847 | W: http://linuxwireless.org/ | 2846 | W: http://linuxwireless.org/ |
2848 | T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git | 2847 | T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git |