projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...
[linux-2.6-block.git]
/
MAINTAINERS
diff --git
a/MAINTAINERS
b/MAINTAINERS
index e1b090f86e0dd1ae4bf328f93b74f5d00236dbc8..1209323b7e43f372b65d0b1db48c0cfc0f6a9973 100644
(file)
--- a/
MAINTAINERS
+++ b/
MAINTAINERS
@@
-595,6
+595,10
@@
S: Odd Fixes
L: linux-alpha@vger.kernel.org
F: arch/alpha/
L: linux-alpha@vger.kernel.org
F: arch/alpha/
+ALPS PS/2 TOUCHPAD DRIVER
+R: Pali Rohár <pali.rohar@gmail.com>
+F: drivers/input/mouse/alps.*
+
ALTERA MAILBOX DRIVER
M: Ley Foon Tan <lftan@altera.com>
L: nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
ALTERA MAILBOX DRIVER
M: Ley Foon Tan <lftan@altera.com>
L: nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
@@
-2776,9
+2780,9
@@
F: include/net/caif/
F: net/caif/
CALGARY x86-64 IOMMU
F: net/caif/
CALGARY x86-64 IOMMU
-M: Muli Ben-Yehuda <muli
@il.ibm.com
>
-M:
"Jon D. Mason"
<jdmason@kudzu.us>
-L:
discuss@x86-64
.org
+M: Muli Ben-Yehuda <muli
x@mulix.org
>
+M:
Jon Mason
<jdmason@kudzu.us>
+L:
iommu@lists.linux-foundation
.org
S: Maintained
F: arch/x86/kernel/pci-calgary_64.c
F: arch/x86/kernel/tce_64.c
S: Maintained
F: arch/x86/kernel/pci-calgary_64.c
F: arch/x86/kernel/tce_64.c
@@
-7420,7
+7424,7
@@
F: drivers/scsi/megaraid.*
F: drivers/scsi/megaraid/
MELLANOX ETHERNET DRIVER (mlx4_en)
F: drivers/scsi/megaraid/
MELLANOX ETHERNET DRIVER (mlx4_en)
-M:
Eugenia Emantayev <eugenia
@mellanox.com>
+M:
Tariq Toukan <tariqt
@mellanox.com>
L: netdev@vger.kernel.org
S: Supported
W: http://www.mellanox.com
L: netdev@vger.kernel.org
S: Supported
W: http://www.mellanox.com
@@
-8959,6
+8963,7
@@
L: linux-gpio@vger.kernel.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
S: Maintained
F: Documentation/devicetree/bindings/pinctrl/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
S: Maintained
F: Documentation/devicetree/bindings/pinctrl/
+F: Documentation/pinctrl.txt
F: drivers/pinctrl/
F: include/linux/pinctrl/
F: drivers/pinctrl/
F: include/linux/pinctrl/