Merge tag 'pci-v3.16-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

Pull PCI fixes from Bjorn Helgaas:
 "Just a fix for the device reset path and an email address update.

  Virtualization
    - Fix "wait for pending transactions" for PCI AF reset (Alex
      Williamson)

  Miscellaneous
    - Update mx6 PCI driver maintainer email (Fabio Estevam)"

* tag 'pci-v3.16-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  MAINTAINERS: Update mx6 PCI driver maintainer's email
  PCI: Fix unaligned access in AF transaction pending test

diff --combined MAINTAINERS
index 5eb2398,f35d07d..c411c40
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -943,10 -943,16 +943,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)
@@@ -1046,33 -1052,9 +1046,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)
@@@ -2935,9 -2917,6 +2935,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>
@@@ -3210,6 -3189,14 +3210,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
@@@ -5530,11 -5517,10 +5530,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
@@@ -6119,11 -6105,12 +6119,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/
@@@ -6787,7 -6774,7 +6787,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
@@@ -6973,7 -6960,7 +6973,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
@@@ -7961,7 -7948,6 +7961,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/
@@@ -8209,15 -8195,13 +8209,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>
@@@ -8984,7 -8968,7 +8984,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
@@@ -9011,7 -8995,7 +9011,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/
@@@ -9292,7 -9276,7 +9292,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
@@@ -9425,6 -9409,12 +9425,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
@@@ -9452,6 -9442,12 +9452,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
@@@ -9484,7 -9480,7 +9484,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
@@@ -9747,14 -9743,6 +9747,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>