Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

Pull libata fixes from Tejun Heo:
 "Late libata fixes.

  The most important one is from Kevin Hao which makes sure that libata
  only allocates tags inside the max tag number the controller supports.
  libata always had this problem but the recent tag allocation change
  and addition of support for sata_fsl which only supports queue depth
  of 16 exposed the issue.

  Hans de Goede agreed to become the maintainer of libahci_platform
  which is under higher than usual development pressure from all the new
  controllers popping up from the ARM world"

* 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ahci: add support for the Promise FastTrak TX8660 SATA HBA (ahci mode)
  drivers/ata/pata_ep93xx.c: use signed int type for result of platform_get_irq()
  libata: EH should handle AMNF error condition as a media error
  libata: support the ata host which implements a queue depth less than 32
  MAINTAINERS: Add Hans de Goede as ahci-platform maintainer

diff --combined MAINTAINERS
index 61a8f486306b700749dce48b58ff63c856b3a5eb,c92bb80fcdbed1da8a9d7de7ffe730e0038c66d4..d76e07798e052b8fcb558a3fb72d0321530d3f6d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -156,6 -156,7 +156,6 @@@ F: drivers/net/hamradio/6pack.
  
  8169 10/100/1000 GIGABIT ETHERNET DRIVER
  M:    Realtek linux nic maintainers <nic_swsd@realtek.com>
 -M:    Francois Romieu <romieu@fr.zoreil.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/ethernet/realtek/r8169.c
@@@ -942,10 -943,16 +942,10 @@@ L:      linux-arm-kernel@lists.infradead.or
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
  F:    arch/arm/mach-imx/
 +F:    arch/arm/mach-mxs/
  F:    arch/arm/boot/dts/imx*
  F:    arch/arm/configs/imx*_defconfig
  
 -ARM/FREESCALE MXS ARM ARCHITECTURE
 -M:    Shawn Guo <shawn.guo@linaro.org>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -T:    git git://git.linaro.org/people/shawnguo/linux-2.6.git
 -F:    arch/arm/mach-mxs/
 -
  ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1045,33 -1052,9 +1045,33 @@@ M:    Santosh Shilimkar <santosh.shilimkar
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-keystone/
 -F:    drivers/clk/keystone/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
  
 +ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
 +M:    Santosh Shilimkar <santosh.shilimkar@ti.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    drivers/clk/keystone/
 +
 +ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE
 +M:    Santosh Shilimkar <santosh.shilimkar@ti.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    drivers/clocksource/timer-keystone.c
 +
 +ARM/TEXAS INSTRUMENT KEYSTONE RESET DRIVER
 +M:    Santosh Shilimkar <santosh.shilimkar@ti.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    drivers/power/reset/keystone-reset.c
 +
 +ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS
 +M:    Santosh Shilimkar <santosh.shilimkar@ti.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    drivers/memory/*emif*
 +
  ARM/LOGICPD PXA270 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1313,20 -1296,6 +1313,20 @@@ W:    http://oss.renesas.co
  Q:    http://patchwork.kernel.org/project/linux-sh/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
  S:    Supported
 +F:    arch/arm/boot/dts/emev2*
 +F:    arch/arm/boot/dts/r7s*
 +F:    arch/arm/boot/dts/r8a*
 +F:    arch/arm/boot/dts/sh*
 +F:    arch/arm/configs/ape6evm_defconfig
 +F:    arch/arm/configs/armadillo800eva_defconfig
 +F:    arch/arm/configs/bockw_defconfig
 +F:    arch/arm/configs/genmai_defconfig
 +F:    arch/arm/configs/koelsch_defconfig
 +F:    arch/arm/configs/kzm9g_defconfig
 +F:    arch/arm/configs/lager_defconfig
 +F:    arch/arm/configs/mackerel_defconfig
 +F:    arch/arm/configs/marzen_defconfig
 +F:    arch/arm/configs/shmobile_defconfig
  F:    arch/arm/mach-shmobile/
  F:    drivers/sh/
  
@@@ -2948,9 -2917,6 +2948,9 @@@ L:      linux-doc@vger.kernel.or
  T:    quilt http://www.infradead.org/~rdunlap/Doc/patches/
  S:    Maintained
  F:    Documentation/
 +X:    Documentation/ABI/
 +X:    Documentation/devicetree/
 +X:    Documentation/[a-z][a-z]_[A-Z][A-Z]/
  
  DOUBLETALK DRIVER
  M:    "James R. Van Zandt" <jrv@vanzandt.mv.com>
@@@ -3223,6 -3189,14 +3223,6 @@@ L:     linux-scsi@vger.kernel.or
  S:    Maintained
  F:    drivers/scsi/eata_pio.*
  
 -EBTABLES
 -L:    netfilter-devel@vger.kernel.org
 -W:    http://ebtables.sourceforge.net/
 -S:    Orphan
 -F:    include/linux/netfilter_bridge/ebt_*.h
 -F:    include/uapi/linux/netfilter_bridge/ebt_*.h
 -F:    net/bridge/netfilter/ebt*.c
 -
  EC100 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
@@@ -4510,7 -4484,8 +4510,7 @@@ S:      Supporte
  F:    drivers/idle/i7300_idle.c
  
  IEEE 802.15.4 SUBSYSTEM
 -M:    Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
 -M:    Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
 +M:    Alexander Aring <alex.aring@gmail.com>
  L:    linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)
  W:    http://apps.sourceforge.net/trac/linux-zigbee
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git
@@@ -5542,11 -5517,10 +5542,11 @@@ S:   Maintaine
  F:    arch/arm/mach-lpc32xx/
  
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
 -M:    Nagalakshmi Nandigama <Nagalakshmi.Nandigama@lsi.com>
 -M:    Sreekanth Reddy <Sreekanth.Reddy@lsi.com>
 -M:    support@lsi.com
 -L:    DL-MPTFusionLinux@lsi.com
 +M:    Nagalakshmi Nandigama <nagalakshmi.nandigama@avagotech.com>
 +M:    Praveen Krishnamoorthy <praveen.krishnamoorthy@avagotech.com>
 +M:    Sreekanth Reddy <sreekanth.reddy@avagotech.com>
 +M:    Abhijit Mahajan <abhijit.mahajan@avagotech.com>
 +L:    MPT-FusionLinux.pdl@avagotech.com
  L:    linux-scsi@vger.kernel.org
  W:    http://www.lsilogic.com/support
  S:    Supported
@@@ -6131,11 -6105,12 +6131,11 @@@ F:   Documentation/networking/s2io.tx
  F:    Documentation/networking/vxge.txt
  F:    drivers/net/ethernet/neterion/
  
 -NETFILTER/IPTABLES
 +NETFILTER ({IP,IP6,ARP,EB,NF}TABLES)
  M:    Pablo Neira Ayuso <pablo@netfilter.org>
  M:    Patrick McHardy <kaber@trash.net>
  M:    Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
  L:    netfilter-devel@vger.kernel.org
 -L:    netfilter@vger.kernel.org
  L:    coreteam@netfilter.org
  W:    http://www.netfilter.org/
  W:    http://www.iptables.org/
@@@ -6799,7 -6774,7 +6799,7 @@@ F:      arch/x86/kernel/quirks.
  
  PCI DRIVER FOR IMX6
  M:    Richard Zhu <r65037@freescale.com>
 -M:    Shawn Guo <shawn.guo@linaro.org>
 +M:    Shawn Guo <shawn.guo@freescale.com>
  L:    linux-pci@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
@@@ -6985,7 -6960,7 +6985,7 @@@ PKUNITY SOC DRIVER
  M:    Guan Xuetao <gxt@mprc.pku.edu.cn>
  W:    http://mprc.pku.edu.cn/~guanxuetao/linux
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git
 +T:    git git://github.com/gxt/linux.git
  F:    drivers/input/serio/i8042-unicore32io.h
  F:    drivers/i2c/busses/i2c-puv3.c
  F:    drivers/video/fb-puv3.c
@@@ -7973,7 -7948,6 +7973,7 @@@ F:      drivers/mmc/host/sdhci-spear.
  
  SECURITY SUBSYSTEM
  M:    James Morris <james.l.morris@oracle.com>
 +M:    Serge E. Hallyn <serge@hallyn.com>
  L:    linux-security-module@vger.kernel.org (suggested Cc:)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
  W:    http://kernsec.org/
@@@ -8019,6 -7993,16 +8019,16 @@@ F:    drivers/ata
  F:    include/linux/ata.h
  F:    include/linux/libata.h
  
+ SERIAL ATA AHCI PLATFORM devices support
+ M:    Hans de Goede <hdegoede@redhat.com>
+ M:    Tejun Heo <tj@kernel.org>
+ L:    linux-ide@vger.kernel.org
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
+ S:    Supported
+ F:    drivers/ata/ahci_platform.c
+ F:    drivers/ata/libahci_platform.c
+ F:    include/linux/ahci_platform.h
+ 
  SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
  M:    Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
  L:    linux-scsi@vger.kernel.org
@@@ -8221,15 -8205,13 +8231,15 @@@ S:   Maintaine
  F:    drivers/usb/misc/sisusbvga/
  
  SLAB ALLOCATOR
 -M:    Christoph Lameter <cl@linux-foundation.org>
 +M:    Christoph Lameter <cl@linux.com>
  M:    Pekka Enberg <penberg@kernel.org>
 -M:    Matt Mackall <mpm@selenic.com>
 +M:    David Rientjes <rientjes@google.com>
 +M:    Joonsoo Kim <iamjoonsoo.kim@lge.com>
 +M:    Andrew Morton <akpm@linux-foundation.org>
  L:    linux-mm@kvack.org
  S:    Maintained
  F:    include/linux/sl?b*.h
 -F:    mm/sl?b.c
 +F:    mm/sl?b*
  
  SLEEPABLE READ-COPY UPDATE (SRCU)
  M:    Lai Jiangshan <laijs@cn.fujitsu.com>
@@@ -8996,7 -8978,7 +9006,7 @@@ F:      drivers/media/radio/radio-raremono.
  
  THERMAL
  M:    Zhang Rui <rui.zhang@intel.com>
 -M:    Eduardo Valentin <eduardo.valentin@ti.com>
 +M:    Eduardo Valentin <edubezval@gmail.com>
  L:    linux-pm@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git
@@@ -9023,7 -9005,7 +9033,7 @@@ S:      Maintaine
  F:    drivers/platform/x86/thinkpad_acpi.c
  
  TI BANDGAP AND THERMAL DRIVER
 -M:    Eduardo Valentin <eduardo.valentin@ti.com>
 +M:    Eduardo Valentin <edubezval@gmail.com>
  L:    linux-pm@vger.kernel.org
  S:    Supported
  F:    drivers/thermal/ti-soc-thermal/
@@@ -9304,7 -9286,7 +9314,7 @@@ UNICORE32 ARCHITECTURE
  M:    Guan Xuetao <gxt@mprc.pku.edu.cn>
  W:    http://mprc.pku.edu.cn/~guanxuetao/linux
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git
 +T:    git git://github.com/gxt/linux.git
  F:    arch/unicore32/
  
  UNIFDEF
@@@ -9437,6 -9419,12 +9447,6 @@@ S:     Maintaine
  F:    drivers/usb/host/isp116x*
  F:    include/linux/usb/isp116x.h
  
 -USB KAWASAKI LSI DRIVER
 -M:    Oliver Neukum <oliver@neukum.org>
 -L:    linux-usb@vger.kernel.org
 -S:    Maintained
 -F:    drivers/usb/serial/kl5kusb105.*
 -
  USB MASS STORAGE DRIVER
  M:    Matthew Dharm <mdharm-usb@one-eyed-alien.net>
  L:    linux-usb@vger.kernel.org
@@@ -9464,6 -9452,12 +9474,6 @@@ S:     Maintaine
  F:    Documentation/usb/ohci.txt
  F:    drivers/usb/host/ohci*
  
 -USB OPTION-CARD DRIVER
 -M:    Matthias Urlichs <smurf@smurf.noris.de>
 -L:    linux-usb@vger.kernel.org
 -S:    Maintained
 -F:    drivers/usb/serial/option.c
 -
  USB PEGASUS DRIVER
  M:    Petko Manolov <petkan@nucleusys.com>
  L:    linux-usb@vger.kernel.org
@@@ -9496,7 -9490,7 +9506,7 @@@ S:      Maintaine
  F:    drivers/net/usb/rtl8150.c
  
  USB SERIAL SUBSYSTEM
 -M:    Johan Hovold <jhovold@gmail.com>
 +M:    Johan Hovold <johan@kernel.org>
  L:    linux-usb@vger.kernel.org
  S:    Maintained
  F:    Documentation/usb/usb-serial.txt
@@@ -9759,14 -9753,6 +9769,14 @@@ L:    virtualization@lists.linux-foundatio
  S:    Supported
  F:    arch/x86/kernel/cpu/vmware.c
  
 +VMWARE BALLOON DRIVER
 +M:    Xavier Deguillard <xdeguillard@vmware.com>
 +M:    Philip Moltmann <moltmann@vmware.com>
 +M:    "VMware, Inc." <pv-drivers@vmware.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    drivers/misc/vmw_balloon.c
 +
  VMWARE VMXNET3 ETHERNET DRIVER
  M:    Shreyas Bhatewara <sbhatewara@vmware.com>
  M:    "VMware, Inc." <pv-drivers@vmware.com>