Merge branch 'master' into for-next
[linux-2.6.git] / MAINTAINERS
index 4837907..b6d6d51 100644 (file)
@@ -2340,7 +2340,7 @@ F:        include/linux/edac_mce.h
 
 EDAC-I82975X
 M:     Ranganathan Desikan <ravi@jetztechnologies.com>
-M:     "Arvind R." <arvind@jetztechnologies.com>
+M:     "Arvind R." <arvino55@gmail.com>
 L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
@@ -3437,6 +3437,7 @@ F:        net/ipx/
 IRDA SUBSYSTEM
 M:     Samuel Ortiz <samuel@sortiz.org>
 L:     irda-users@lists.sourceforge.net (subscribers-only)
+L:     netdev@vger.kernel.org
 W:     http://irda.sourceforge.net/
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git
@@ -3880,6 +3881,12 @@ L:       linux-security-module@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git
 S:     Supported
 
+LIS3LV02D ACCELEROMETER DRIVER
+M:     Eric Piel <eric.piel@tremplin-utc.net>
+S:     Maintained
+F:     Documentation/hwmon/lis3lv02d
+F:     drivers/hwmon/lis3lv02d.*
+
 LLC (802.2)
 M:     Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
 S:     Maintained
@@ -3887,12 +3894,6 @@ F:       include/linux/llc.h
 F:     include/net/llc*
 F:     net/llc/
 
-LIS3LV02D ACCELEROMETER DRIVER
-M:     Eric Piel <eric.piel@tremplin-utc.net>
-S:     Maintained
-F:     Documentation/hwmon/lis3lv02d
-F:     drivers/hwmon/lis3lv02d.*
-
 LM73 HARDWARE MONITOR DRIVER
 M:     Guillaume Ligneul <guillaume.ligneul@gmail.com>
 L:     lm-sensors@lm-sensors.org