Merge remote-tracking branch 'nvdimm/libnvdimm-for-next'

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index e059bae82c07da28d15023dcdcb1922e655edfb8..7016beec7f93a157694bd97981722472f6bf815a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4394,6 +4394,13 @@ F:       include/linux/fmc*.h
 F:     include/linux/ipmi-fru.h
 K:     fmc_d.*register
 
+FPGA MANAGER FRAMEWORK
+M:     Alan Tull <atull@opensource.altera.com>
+S:     Maintained
+F:     drivers/fpga/
+F:     include/linux/fpga/fpga-mgr.h
+W:     http://www.rocketboards.org
+
 FPU EMULATOR
 M:     Bill Metzenthen <billm@melbpc.org.au>
 W:     http://floatingpoint.sourceforge.net/emulator/index.html
@@ -5591,6 +5598,12 @@ F:       Documentation/networking/README.ipw2100
 F:     Documentation/networking/README.ipw2200
 F:     drivers/net/wireless/ipw2x00/
 
+INTEL(R) TRACE HUB
+M:     Alexander Shishkin <alexander.shishkin@linux.intel.com>
+S:     Supported
+F:     Documentation/trace/intel_th.txt
+F:     drivers/hwtracing/intel_th/
+
 INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
 M:     Richard L Maliszewski <richard.l.maliszewski@intel.com>
 M:     Gang Wei <gang.wei@intel.com>
@@ -5638,6 +5651,22 @@ F:       include/linux/mei_cl_bus.h
 F:     drivers/misc/mei/*
 F:     Documentation/misc-devices/mei/*
 
+INTEL MIC DRIVERS (mic)
+M:     Sudeep Dutt <sudeep.dutt@intel.com>
+M:     Ashutosh Dixit <ashutosh.dixit@intel.com>
+S:     Supported
+W:     https://github.com/sudeepdutt/mic
+W:     http://software.intel.com/en-us/mic-developer
+F:     include/linux/mic_bus.h
+F:     include/linux/scif.h
+F:     include/uapi/linux/mic_common.h
+F:     include/uapi/linux/mic_ioctl.h
+F      include/uapi/linux/scif_ioctl.h
+F:     drivers/misc/mic/
+F:     drivers/dma/mic_x100_dma.c
+F:     drivers/dma/mic_x100_dma.h
+F      Documentation/mic/
+
 INTEL PMC IPC DRIVER
 M:     Zha Qipeng<qipeng.zha@intel.com>
 L:     platform-driver-x86@vger.kernel.org
@@ -6780,6 +6809,12 @@ W:       http://linuxtv.org
 S:     Maintained
 F:     drivers/media/radio/radio-maxiradio*
 
+MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVER
+M:     Peter Rosin <peda@axentia.se>
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     drivers/iio/potentiometer/mcp4531.c
+
 MEDIA DRIVERS FOR RENESAS - VSP1
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
@@ -7015,6 +7050,13 @@ S:       Supported
 F:     include/linux/mlx5/
 F:     drivers/infiniband/hw/mlx5/
 
+MELEXIS MLX90614 DRIVER
+M:     Crt Mori <cmo@melexis.com>
+L:     linux-iio@vger.kernel.org
+W:     http://www.melexis.com
+S:     Supported
+F:     drivers/iio/temperature/mlx90614.c
+
 MN88472 MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>
 L:     linux-media@vger.kernel.org
@@ -9264,6 +9306,14 @@ S:       Maintained
 F:     include/linux/mmc/dw_mmc.h
 F:     drivers/mmc/host/dw_mmc*
 
+SYSTEM TRACE MODULE CLASS
+M:     Alexander Shishkin <alexander.shishkin@linux.intel.com>
+S:     Maintained
+F:     Documentation/trace/stm.txt
+F:     drivers/hwtracing/stm/
+F:     include/linux/stm.h
+F:     include/uapi/linux/stm.h
+
 THUNDERBOLT DRIVER
 M:     Andreas Noever <andreas.noever@gmail.com>
 S:     Maintained
@@ -9479,8 +9529,8 @@ F:        include/uapi/linux/phantom.h
 
 SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
 M:     Jayamohan Kallickal <jayamohan.kallickal@avagotech.com>
-M:     Minh Tran <minh.tran@avagotech.com>
-M:     John Soni Jose <sony.john-n@avagotech.com>
+M:     Ketan Mukadam <ketan.mukadam@avagotech.com>
+M:     John Soni Jose <sony.john@avagotech.com>
 L:     linux-scsi@vger.kernel.org
 W:     http://www.avagotech.com
 S:     Supported
@@ -10142,9 +10192,11 @@ F:     drivers/staging/vt665?/
 
 STAGING - WILC1000 WIFI DRIVER
 M:     Johnny Kim <johnny.kim@atmel.com>
-M:     Rachel Kim <rachel.kim@atmel.com>
-M:     Dean Lee <dean.lee@atmel.com>
+M:     Austin Shin <austin.shin@atmel.com>
 M:     Chris Park <chris.park@atmel.com>
+M:     Tony Cho <tony.cho@atmel.com>
+M:     Glen Lee <glen.lee@atmel.com>
+M:     Leo Kim <leo.kim@atmel.com>
 L:     linux-wireless@vger.kernel.org
 S:     Supported
 F:     drivers/staging/wilc1000/