git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs...
[pandora-kernel.git]
/
MAINTAINERS
diff --git
a/MAINTAINERS
b/MAINTAINERS
index
f1db840
..
506fe49
100644
(file)
--- a/
MAINTAINERS
+++ b/
MAINTAINERS
@@
-2760,7
+2760,7
@@
F: fs/freevxfs/
FREEZER
M: Pavel Machek <pavel@ucw.cz>
M: "Rafael J. Wysocki" <rjw@sisk.pl>
FREEZER
M: Pavel Machek <pavel@ucw.cz>
M: "Rafael J. Wysocki" <rjw@sisk.pl>
-L: linux-pm@
lists.linux-foundation
.org
+L: linux-pm@
vger.kernel
.org
S: Supported
F: Documentation/power/freezing-of-tasks.txt
F: include/linux/freezer.h
S: Supported
F: Documentation/power/freezing-of-tasks.txt
F: include/linux/freezer.h
@@
-3022,7
+3022,7
@@
F: drivers/video/hgafb.c
HIBERNATION (aka Software Suspend, aka swsusp)
M: Pavel Machek <pavel@ucw.cz>
M: "Rafael J. Wysocki" <rjw@sisk.pl>
HIBERNATION (aka Software Suspend, aka swsusp)
M: Pavel Machek <pavel@ucw.cz>
M: "Rafael J. Wysocki" <rjw@sisk.pl>
-L: linux-pm@
lists.linux-foundation
.org
+L: linux-pm@
vger.kernel
.org
S: Supported
F: arch/x86/power/
F: drivers/base/power/
S: Supported
F: arch/x86/power/
F: drivers/base/power/
@@
-3217,7
+3217,7
@@
F: drivers/ide/ide-cd*
IDLE-I7300
M: Andy Henroid <andrew.d.henroid@intel.com>
IDLE-I7300
M: Andy Henroid <andrew.d.henroid@intel.com>
-L: linux-pm@
lists.linux-foundation
.org
+L: linux-pm@
vger.kernel
.org
S: Supported
F: drivers/idle/i7300_idle.c
S: Supported
F: drivers/idle/i7300_idle.c
@@
-3300,7
+3300,7
@@
F: firmware/isci/
INTEL IDLE DRIVER
M: Len Brown <lenb@kernel.org>
INTEL IDLE DRIVER
M: Len Brown <lenb@kernel.org>
-L: linux-pm@
lists.linux-foundation
.org
+L: linux-pm@
vger.kernel
.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6.git
S: Supported
F: drivers/idle/intel_idle.c
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6.git
S: Supported
F: drivers/idle/intel_idle.c
@@
-3397,7
+3397,7
@@
F: drivers/net/ethernet/intel/
INTEL MRST PMU DRIVER
M: Len Brown <len.brown@intel.com>
INTEL MRST PMU DRIVER
M: Len Brown <len.brown@intel.com>
-L: linux-pm@
lists.linux-foundation
.org
+L: linux-pm@
vger.kernel
.org
S: Supported
F: arch/x86/platform/mrst/pmu.*
S: Supported
F: arch/x86/platform/mrst/pmu.*
@@
-4760,10
+4760,12
@@
F: drivers/i2c/busses/i2c-ocores.c
OPEN FIRMWARE AND FLATTENED DEVICE TREE
M: Grant Likely <grant.likely@secretlab.ca>
OPEN FIRMWARE AND FLATTENED DEVICE TREE
M: Grant Likely <grant.likely@secretlab.ca>
+M: Rob Herring <rob.herring@calxeda.com>
L: devicetree-discuss@lists.ozlabs.org (moderated for non-subscribers)
W: http://fdt.secretlab.ca
T: git git://git.secretlab.ca/git/linux-2.6.git
S: Maintained
L: devicetree-discuss@lists.ozlabs.org (moderated for non-subscribers)
W: http://fdt.secretlab.ca
T: git git://git.secretlab.ca/git/linux-2.6.git
S: Maintained
+F: Documentation/devicetree
F: drivers/of
F: include/linux/of*.h
K: of_get_property
F: drivers/of
F: include/linux/of*.h
K: of_get_property
@@
-5042,6
+5044,11
@@
L: linux-mtd@lists.infradead.org
S: Maintained
F: drivers/mtd/devices/phram.c
S: Maintained
F: drivers/mtd/devices/phram.c
+PIN CONTROL SUBSYSTEM
+M: Linus Walleij <linus.walleij@linaro.org>
+S: Maintained
+F: drivers/pinmux/
+
PKTCDVD DRIVER
M: Peter Osterlund <petero2@telia.com>
S: Maintained
PKTCDVD DRIVER
M: Peter Osterlund <petero2@telia.com>
S: Maintained
@@
-6166,7
+6173,7
@@
S: Maintained
STAGING SUBSYSTEM
M: Greg Kroah-Hartman <gregkh@suse.de>
STAGING SUBSYSTEM
M: Greg Kroah-Hartman <gregkh@suse.de>
-T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
-2.6
.git
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
L: devel@driverdev.osuosl.org
S: Maintained
F: drivers/staging/
L: devel@driverdev.osuosl.org
S: Maintained
F: drivers/staging/
@@
-6207,6
+6214,11
@@
M: David Rowe <david@rowetel.com>
S: Odd Fixes
F: drivers/staging/echo/
S: Odd Fixes
F: drivers/staging/echo/
+STAGING - ET131X NETWORK DRIVER
+M: Mark Einon <mark.einon@gmail.com>
+S: Odd Fixes
+F: drivers/staging/et131x/
+
STAGING - FLARION FT1000 DRIVERS
M: Marek Belisko <marek.belisko@gmail.com>
S: Odd Fixes
STAGING - FLARION FT1000 DRIVERS
M: Marek Belisko <marek.belisko@gmail.com>
S: Odd Fixes
@@
-6235,6
+6247,13
@@
W: http://www.lirc.org/
S: Odd Fixes
F: drivers/staging/lirc/
S: Odd Fixes
F: drivers/staging/lirc/
+STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec)
+M: Julian Andres Klode <jak@jak-linux.org>
+M: Marc Dietrich <marvin24@gmx.de>
+L: ac100@lists.launchpad.net (moderated for non-subscribers)
+S: Maintained
+F: drivers/staging/nvec/
+
STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
M: Andres Salomon <dilinger@queued.net>
M: Chris Ball <cjb@laptop.org>
STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
M: Andres Salomon <dilinger@queued.net>
M: Chris Ball <cjb@laptop.org>
@@
-6333,7
+6352,7
@@
SUSPEND TO RAM
M: Len Brown <len.brown@intel.com>
M: Pavel Machek <pavel@ucw.cz>
M: "Rafael J. Wysocki" <rjw@sisk.pl>
M: Len Brown <len.brown@intel.com>
M: Pavel Machek <pavel@ucw.cz>
M: "Rafael J. Wysocki" <rjw@sisk.pl>
-L: linux-pm@
lists.linux-foundation
.org
+L: linux-pm@
vger.kernel
.org
S: Supported
F: Documentation/power/
F: arch/x86/kernel/acpi/
S: Supported
F: Documentation/power/
F: arch/x86/kernel/acpi/