diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:17:01 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:17:01 +1100 |
| commit | 9f72a3a19c1ca629d80c5ddc7eae2e1cb4bd1dcb (patch) | |
| tree | 6522c1e900bf2d02d0a08fa5fc00e3ec9b4482f7 /MAINTAINERS | |
| parent | c47a63ccb4637bf4e01733e85ecdc269f5d3e76e (diff) | |
| parent | ddf12286951aee1e7763112cf26629de3fabe6ae (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
MAINTAINERS
fs/eventpoll.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 22aa12f0cd9e..7175bcb6bc84 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2355,7 +2355,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 @@ -3451,6 +3451,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 @@ -3894,6 +3895,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/misc-devices/lis3lv02d +F: drivers/misc/lis3lv02d/ + LLC (802.2) M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> S: Maintained @@ -3901,12 +3908,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/misc-devices/lis3lv02d -F: drivers/misc/lis3lv02d/ - LM73 HARDWARE MONITOR DRIVER M: Guillaume Ligneul <guillaume.ligneul@gmail.com> L: lm-sensors@lm-sensors.org |