aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS5
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
2102P: Ben Dooks (embedded platforms) 2102P: Ben Dooks (embedded platforms)
2103M: ben-linux@fluff.org 2103M: ben-linux@fluff.org
2104L: linux-i2c@vger.kernel.org 2104L: linux-i2c@vger.kernel.org
2105T: quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ 2105W: http://i2c.wiki.kernel.org/
2106T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
2106S: Maintained 2107S: Maintained
2107 2108
2108I2C-TINY-USB DRIVER 2109I2C-TINY-USB DRIVER
@@ -2841,8 +2842,6 @@ S: Maintained
2841MAC80211 2842MAC80211
2842P: Johannes Berg 2843P: Johannes Berg
2843M: johannes@sipsolutions.net 2844M: johannes@sipsolutions.net
2844P: Michael Wu
2845M: flamingice@sourmilk.net
2846L: linux-wireless@vger.kernel.org 2845L: linux-wireless@vger.kernel.org
2847W: http://linuxwireless.org/ 2846W: http://linuxwireless.org/
2848T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git 2847T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git