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 'master' into for-next
[pandora-kernel.git]
/
MAINTAINERS
diff --git
a/MAINTAINERS
b/MAINTAINERS
index
5b42290
..
d603d34
100644
(file)
--- a/
MAINTAINERS
+++ b/
MAINTAINERS
@@
-485,8
+485,8
@@
S: Maintained
F: drivers/input/mouse/bcm5974.c
APPLE SMC DRIVER
F: drivers/input/mouse/bcm5974.c
APPLE SMC DRIVER
-M:
Nicolas Boichat <nicolas@boichat.ch
>
-L:
mactel-linux-devel@lists.sourceforge.net
+M:
Henrik Rydberg <rydberg@euromail.se
>
+L:
lm-sensors@lm-sensors.org
S: Maintained
F: drivers/hwmon/applesmc.c
S: Maintained
F: drivers/hwmon/applesmc.c
@@
-2667,16
+2667,12
@@
F: Documentation/timers/hpet.txt
F: drivers/char/hpet.c
F: include/linux/hpet.h
F: drivers/char/hpet.c
F: include/linux/hpet.h
-HPET:
i3
86
-M: "Venkatesh Pallipadi (Venki)" <venk
atesh.pallipadi@intel
.com>
+HPET:
x
86
+M: "Venkatesh Pallipadi (Venki)" <venk
i@google
.com>
S: Maintained
F: arch/x86/kernel/hpet.c
F: arch/x86/include/asm/hpet.h
S: Maintained
F: arch/x86/kernel/hpet.c
F: arch/x86/include/asm/hpet.h
-HPET: x86_64
-M: Vojtech Pavlik <vojtech@suse.cz>
-S: Maintained
-
HPET: ACPI
M: Bob Picco <bob.picco@hp.com>
S: Maintained
HPET: ACPI
M: Bob Picco <bob.picco@hp.com>
S: Maintained
@@
-4791,12
+4787,11
@@
F: drivers/s390/crypto/
S390 ZFCP DRIVER
M: Christof Schmitt <christof.schmitt@de.ibm.com>
S390 ZFCP DRIVER
M: Christof Schmitt <christof.schmitt@de.ibm.com>
-M:
Martin Peschke <mp3@de
.ibm.com>
+M:
Swen Schillig <swen@vnet
.ibm.com>
M: linux390@de.ibm.com
L: linux-s390@vger.kernel.org
W: http://www.ibm.com/developerworks/linux/linux390/
S: Supported
M: linux390@de.ibm.com
L: linux-s390@vger.kernel.org
W: http://www.ibm.com/developerworks/linux/linux390/
S: Supported
-F: Documentation/s390/zfcpdump.txt
F: drivers/s390/scsi/zfcp_*
S390 IUCV NETWORK LAYER
F: drivers/s390/scsi/zfcp_*
S390 IUCV NETWORK LAYER