Merge tag 'for-linus-20140127' of git://git.infradead.org/linux-mtd

Pull MTD updates from Brian Norris:
 - Add me (Brian Norris) as an additional MTD maintainer (it'd be nice to get
   David's "ack" for this; I'm sure he approves, but he's been pretty silent
   lately)
 - Add Ezequiel Garcie as maintainer for the pxa3xx NAND driver
 - Last (?) round of pxa3xx improvements for supporting Armada 370/XP
 - Typical churn in driver boilerplate (OOM messages, printk()'s, devm_*, etc.)
 - Quad read mode support for SPI NOR driver (m25p80)
 - Update Davinci NAND driver to prepare for use on new platforms
 - Begin to kill off NAND_MAX_{PAGE,OOB}SIZE macros; more work is pending
 - Miscellaneous NAND device support (new IDs)
 - Add READ RETRY support for Micron MLC NAND
 - Support new GPMI NAND ECC layout device-tree binding
 - Avoid mapping stack/vmalloc() memory for GPMI NAND DMA

* tag 'for-linus-20140127' of git://git.infradead.org/linux-mtd: (151 commits)
  mtd: gpmi: add sanity check when mapping DMA for read_buf/write_buf
  mtd: gpmi: allocate a proper buffer for non ECC read/write
  mtd: m25p80: Set rx_nbits for Quad SPI transfers
  mtd: m25p80: Enable Quad SPI read transfers for s25fl512s
  mtd: s3c2410: Merge plat/regs-nand.h into s3c2410.c
  mtd: mtdram: add missing 'const'
  mtd: m25p80: assign default read command
  mtd: nuc900_nand: remove redundant return value check of platform_get_resource()
  mtd: plat_nand: remove redundant return value check of platform_get_resource()
  mtd: nand: add Intel manufacturer ID
  mtd: nand: add SanDisk manufacturer ID
  mtd: nand: add support for Samsung K9LCG08U0B
  mtd: nand: pxa3xx: Add support for 2048 bytes page size devices
  mtd: m25p80: Use OPCODE_QUAD_READ_4B for 4-byte addressing
  mtd: nand: don't use {read,write}_buf for 8-bit transfers
  mtd: nand: use __packed shorthand
  mtd: nand: support Micron READ RETRY
  mtd: nand: add generic READ RETRY support
  mtd: nand: add ONFI vendor block for Micron
  mtd: nand: localize ECC failures per page
  ...

diff --combined MAINTAINERS
index 9bf651c578062ecbc0cd9a6d95959955882da987,01dee8ac357f6fd8776d4b0f2c47194fe850d404..6d73831cfdee11ccc6b1c858a0cd16b22fca0e69
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -93,11 -93,6 +93,11 @@@ Descriptions of section entries
        N: Files and directories with regex patterns.
           N:   [^a-z]tegra     all files whose path contains the word tegra
           One pattern per line.  Multiple N: lines acceptable.
 +         scripts/get_maintainer.pl has different behavior for files that
 +         match F: pattern and matches of N: patterns.  By default,
 +         get_maintainer will not look at git log history when an F: pattern
 +         match occurs.  When an N: match occurs, git log history is used
 +         to also notify the people that have git commit signatures.
        X: Files and directories that are NOT maintained, same rules as F:
           Files exclusions are tested before file matches.
           Can be useful for excluding a specific subdirectory, for instance:
@@@ -257,7 -252,6 +257,7 @@@ F: Documentation/ABI/testing/sysfs-bus-
  F:    drivers/pci/*acpi*
  F:    drivers/pci/*/*acpi*
  F:    drivers/pci/*/*/*acpi*
 +F:    tools/power/acpi
  
  ACPI COMPONENT ARCHITECTURE (ACPICA)
  M:    Robert Moore <[email protected]>
@@@ -272,7 -266,6 +272,7 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/acpi/acpica/
  F:    include/acpi/
 +F:    tools/power/acpi/
  
  ACPI FAN DRIVER
  M:    Zhang Rui <[email protected]>
@@@ -491,6 -484,7 +491,6 @@@ M: Hannes Reinecke <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/scsi/aic7xxx/
 -F:    drivers/scsi/aic7xxx_old/
  
  AIMSLAB FM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <[email protected]>
@@@ -545,13 -539,6 +545,13 @@@ F:       drivers/tty/serial/altera_jtaguart.
  F:    include/linux/altera_uart.h
  F:    include/linux/altera_jtaguart.h
  
 +AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
 +M:    Tom Lendacky <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/crypto/ccp/
 +F:    include/linux/ccp.h
 +
  AMD FAM15H PROCESSOR POWER MONITORING DRIVER
  M:    Andreas Herrmann <[email protected]>
  L:    [email protected]
@@@ -779,12 -766,7 +779,12 @@@ ARM/Allwinner A1X SoC suppor
  M:    Maxime Ripard <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    arch/arm/mach-sunxi/
 +N:    sun[x4567]i
 +
 +ARM/Allwinner SoC Clock Support
 +M:    Emilio López <[email protected]>
 +S:    Maintained
 +F:    drivers/clk/sunxi/
  
  ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
  M:    Andrew Victor <[email protected]>
@@@ -801,7 -783,7 +801,7 @@@ F: arch/arm/boot/dts/sama*.dt
  F:    arch/arm/boot/dts/sama*.dtsi
  
  ARM/CALXEDA HIGHBANK ARCHITECTURE
 -M:    Rob Herring <rob[email protected]>
 +M:    Rob Herring <rob[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-highbank/
@@@ -885,12 -867,6 +885,12 @@@ S:       Maintaine
  F:    arch/arm/mach-ebsa110/
  F:    drivers/net/ethernet/amd/am79c961a.*
  
 +ARM/ENERGY MICRO (SILICON LABS) EFM32 SUPPORT
 +M:    Uwe Kleine-König <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +N:    efm32
 +
  ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
  M:    Daniel Ribeiro <[email protected]>
  M:    Stefan Schmidt <[email protected]>
@@@ -1053,12 -1029,6 +1053,12 @@@ L:    [email protected]
  S:    Maintained
  F:    arch/arm/mach-mvebu/
  
 +ARM/Marvell Berlin SoC support
 +M:    Sebastian Hesselbarth <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-berlin/
 +
  ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
  M:    Jason Cooper <[email protected]>
  M:    Andrew Lunn <[email protected]>
@@@ -1352,14 -1322,6 +1352,14 @@@ F:    drivers/rtc/rtc-ab8500.
  F:    drivers/rtc/rtc-pl031.c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
  
 +ARM/Ux500 CLOCK FRAMEWORK SUPPORT
 +M:    Ulf Hansson <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +T:    git git://git.linaro.org/people/ulfh/clk.git
 +S:    Maintained
 +F:    drivers/clk/ux500/
 +F:    include/linux/platform_data/clk-ux500.h
 +
  ARM/VFP SUPPORT
  M:    Russell King <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1406,10 -1368,6 +1406,10 @@@ T:    git git://git.xilinx.com/linux-xlnx.
  S:    Supported
  F:    arch/arm/mach-zynq/
  F:    drivers/cpuidle/cpuidle-zynq.c
 +N:    zynq
 +N:    xilinx
 +F:    drivers/clocksource/cadence_ttc_timer.c
 +F:    drivers/mmc/host/sdhci-of-arasan.c
  
  ARM SMMU DRIVER
  M:    Will Deacon <[email protected]>
@@@ -1474,7 -1432,7 +1474,7 @@@ F:      Documentation/aoe
  F:    drivers/block/aoe/
  
  ATHEROS ATH GENERIC UTILITIES
 -M:    "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
 +M:    "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/wireless/ath/*
@@@ -1482,7 -1440,7 +1482,7 @@@
  ATHEROS ATH5K WIRELESS DRIVER
  M:    Jiri Slaby <[email protected]>
  M:    Nick Kossifidis <[email protected]>
 -M:    "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
 +M:    "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
  L:    [email protected]
  L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/ath5k
@@@ -1497,6 -1455,17 +1497,6 @@@ T:     git git://github.com/kvalo/ath.gi
  S:    Supported
  F:    drivers/net/wireless/ath/ath6kl/
  
 -ATHEROS ATH9K WIRELESS DRIVER
 -M:    "Luis R. Rodriguez" <[email protected]>
 -M:    Jouni Malinen <[email protected]>
 -M:    Vasanthakumar Thiagarajan <[email protected]>
 -M:    Senthil Balasubramanian <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -W:    http://wireless.kernel.org/en/users/Drivers/ath9k
 -S:    Supported
 -F:    drivers/net/wireless/ath/ath9k/
 -
  WILOCITY WIL6210 WIRELESS DRIVER
  M:    Vladimir Kondratiev <[email protected]>
  L:    [email protected]
@@@ -1626,10 -1595,11 +1626,10 @@@ S:      Supporte
  F:      drivers/scsi/esas2r
  
  AUDIT SUBSYSTEM
 -M:    Al Viro <[email protected]>
  M:    Eric Paris <[email protected]>
  L:    [email protected] (subscribers-only)
  W:    http://people.redhat.com/sgrubb/audit/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git
 +T:    git git://git.infradead.org/users/eparis/audit.git
  S:    Maintained
  F:    include/linux/audit.h
  F:    include/uapi/linux/audit.h
@@@ -2051,7 -2021,6 +2051,7 @@@ L:      [email protected]
  W:    http://gitorious.org/linux-can
  T:    git git://gitorious.org/linux-can/linux-can-next.git
  S:    Maintained
 +F:    Documentation/networking/can.txt
  F:    net/can/
  F:    include/linux/can/core.h
  F:    include/uapi/linux/can.h
@@@ -2186,11 -2155,6 +2186,11 @@@ M:    Nishank Trivedi <[email protected]
  S:    Supported
  F:    drivers/net/ethernet/cisco/enic/
  
 +CISCO VIC LOW LATENCY NIC DRIVER
 +M:      Upinder Malhi <[email protected]>
 +S:      Supported
 +F:      drivers/infiniband/hw/usnic
 +
  CIRRUS LOGIC EP93XX ETHERNET DRIVER
  M:    Hartley Sweeten <[email protected]>
  L:    [email protected]
@@@ -2652,7 -2616,7 +2652,7 @@@ S:      Maintaine
  F:    drivers/platform/x86/dell-laptop.c
  
  DELL LAPTOP SMM DRIVER
 -S:    Orphan
 +M:    Guenter Roeck <[email protected]>
  F:    drivers/char/i8k.c
  F:    include/uapi/linux/i8k.h
  
@@@ -2671,7 -2635,7 +2671,7 @@@ DESIGNWARE USB2 DRD IP DRIVE
  M:    Paul Zimmerman <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/staging/dwc2/
 +F:    drivers/usb/dwc2/
  
  DESIGNWARE USB3 DRD IP DRIVER
  M:    Felipe Balbi <[email protected]>
@@@ -2861,10 -2825,8 +2861,10 @@@ F:    include/uapi/drm
  
  INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
  M:    Daniel Vetter <[email protected]>
 +M:    Jani Nikula <[email protected]>
  L:    [email protected]
  L:    [email protected]
 +Q:    http://patchwork.freedesktop.org/project/intel-gfx/
  T:    git git://people.freedesktop.org/~danvet/drm-intel
  S:    Supported
  F:    drivers/gpu/drm/i915/
@@@ -3368,7 -3330,6 +3368,7 @@@ EXTERNAL CONNECTOR SUBSYSTEM (EXTCON
  M:    MyungJoo Ham <[email protected]>
  M:    Chanwoo Choi <[email protected]>
  L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git
  S:    Maintained
  F:    drivers/extcon/
  F:    Documentation/extcon/
@@@ -3378,6 -3339,7 +3378,6 @@@ M:      Jingoo Han <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/video/exynos/exynos_dp*
 -F:    include/video/exynos_dp*
  
  EXYNOS MIPI DISPLAY DRIVERS
  M:    Inki Dae <[email protected]>
@@@ -3667,7 -3629,6 +3667,7 @@@ W:      http://en.wikipedia.org/wiki/F2F
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
  S:    Maintained
  F:    Documentation/filesystems/f2fs.txt
 +F:    Documentation/ABI/testing/sysfs-fs-f2fs
  F:    fs/f2fs/
  F:    include/linux/f2fs_fs.h
  
@@@ -3988,12 -3949,6 +3988,12 @@@ S:    Orpha
  F:    Documentation/filesystems/hfs.txt
  F:    fs/hfs/
  
 +HFSPLUS FILESYSTEM
 +L:    [email protected]
 +S:    Orphan
 +F:    Documentation/filesystems/hfsplus.txt
 +F:    fs/hfsplus/
 +
  HGA FRAMEBUFFER DRIVER
  M:    Ferenc Bakonyi <[email protected]>
  L:    [email protected]
@@@ -4514,7 -4469,7 +4514,7 @@@ M:      Deepak Saxena <[email protected]
  S:    Maintained
  F:    drivers/char/hw_random/ixp4xx-rng.c
  
 -INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e)
 +INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e/i40evf)
  M:    Jeff Kirsher <[email protected]>
  M:    Jesse Brandeburg <[email protected]>
  M:    Bruce Allan <[email protected]>
@@@ -4523,7 -4478,6 +4523,7 @@@ M:      Don Skidmore <donald.c.skidmore@inte
  M:    Greg Rose <[email protected]>
  M:    Alex Duyck <[email protected]>
  M:    John Ronciak <[email protected]>
 +M:    Mitch Williams <[email protected]>
  L:    [email protected]
  W:    http://www.intel.com/support/feedback.htm
  W:    http://e1000.sourceforge.net/
@@@ -4539,7 -4493,6 +4539,7 @@@ F:      Documentation/networking/ixgb.tx
  F:    Documentation/networking/ixgbe.txt
  F:    Documentation/networking/ixgbevf.txt
  F:    Documentation/networking/i40e.txt
 +F:    Documentation/networking/i40evf.txt
  F:    drivers/net/ethernet/intel/
  
  INTEL-MID GPIO DRIVER
@@@ -4957,7 -4910,7 +4957,7 @@@ F:      include/linux/sunrpc
  F:    include/uapi/linux/sunrpc/
  
  KERNEL VIRTUAL MACHINE (KVM)
 -M:    Gleb Natapov <gleb@redhat.com>
 +M:    Gleb Natapov <gleb@kernel.org>
  M:    Paolo Bonzini <[email protected]>
  L:    [email protected]
  W:    http://www.linux-kvm.org
@@@ -5183,11 -5136,6 +5183,11 @@@ F:    drivers/lguest
  F:    include/linux/lguest*.h
  F:    tools/lguest/
  
 +LIBLOCKDEP
 +M:    Sasha Levin <[email protected]>
 +S:    Maintained
 +F:    tools/lib/lockdep/
 +
  LINUX FOR IBM pSERIES (RS/6000)
  M:    Paul Mackerras <[email protected]>
  W:    http://www.ibm.com/linux/ltc/projects/ppc
@@@ -5622,10 -5570,11 +5622,11 @@@ F:   mm/page_cgroup.
  
  MEMORY TECHNOLOGY DEVICES (MTD)
  M:    David Woodhouse <[email protected]>
+ M:    Brian Norris <[email protected]>
  L:    [email protected]
  W:    http://www.linux-mtd.infradead.org/
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
- T:    git git://git.infradead.org/mtd-2.6.git
+ T:    git git://git.infradead.org/linux-mtd.git
  S:    Maintained
  F:    drivers/mtd/
  F:    include/linux/mtd/
@@@ -5783,7 -5732,7 +5784,7 @@@ F:      drivers/mfd
  F:    include/linux/mfd/
  
  MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
 -M:    Chris Ball <c[email protected]>
 +M:    Chris Ball <c[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
  S:    Maintained
@@@ -6308,7 -6257,7 +6309,7 @@@ F:      drivers/i2c/busses/i2c-ocores.
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE
  M:    Grant Likely <[email protected]>
 -M:    Rob Herring <rob[email protected]>
 +M:    Rob Herring <rob[email protected]>
  L:    [email protected]
  W:    http://fdt.secretlab.ca
  T:    git git://git.secretlab.ca/git/linux-2.6.git
@@@ -6320,7 -6269,7 +6321,7 @@@ K:      of_get_propert
  K:    of_match_table
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
 -M:    Rob Herring <rob[email protected]>
 +M:    Rob Herring <rob[email protected]>
  M:    Pawel Moll <[email protected]>
  M:    Mark Rutland <[email protected]>
  M:    Ian Campbell <[email protected]>
@@@ -6753,7 -6702,7 +6754,7 @@@ F:      include/linux/timer
  F:    kernel/*timer*
  
  POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
 -M:    Anton Vorontsov <[email protected]>
 +M:    Dmitry Eremin-Solenikov <[email protected]>
  M:    David Woodhouse <[email protected]>
  T:    git git://git.infradead.org/battery-2.6.git
  S:    Maintained
@@@ -6942,6 -6891,12 +6943,12 @@@ F:    include/sound/pxa2xx-lib.
  F:    sound/arm/pxa*
  F:    sound/soc/pxa/
  
+ PXA3xx NAND FLASH DRIVER
+ M:    Ezequiel Garcia <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/mtd/nand/pxa3xx-nand.c
+ 
  MMP SUPPORT
  M:    Eric Miao <[email protected]>
  M:    Haojian Zhuang <[email protected]>
@@@ -6972,7 -6927,8 +6979,7 @@@ S:      Maintaine
  F:    drivers/scsi/qla1280.[ch]
  
  QLOGIC QLA2XXX FC-SCSI DRIVER
 -M:    Andrew Vasquez <[email protected]>
 -M:    [email protected]
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/scsi/LICENSE.qla2xxx
@@@ -7034,14 -6990,6 +7041,14 @@@ T:    git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/tuners/qt1010*
  
 +QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
 +M:    QCA ath9k Development <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +W:    http://wireless.kernel.org/en/users/Drivers/ath9k
 +S:    Supported
 +F:    drivers/net/wireless/ath/ath9k/
 +
  QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
  M:    Kalle Valo <[email protected]>
  L:    [email protected]
@@@ -7075,7 -7023,7 +7082,7 @@@ F:      drivers/media/parport/*-qcam
  RADOS BLOCK DEVICE (RBD)
  M:    Yehuda Sadeh <[email protected]>
  M:    Sage Weil <[email protected]>
 -M:    Alex Elder <elder@inktank.com>
 +M:    Alex Elder <elder@kernel.org>
  M:    [email protected]
  W:    http://ceph.com/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
@@@ -7153,12 -7101,6 +7160,12 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    Documentation/RCU/torture.txt
  F:    kernel/rcu/torture.c
  
 +RCUTORTURE TEST FRAMEWORK
 +M:    "Paul E. McKenney" <[email protected]>
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 +F:    tools/testing/selftests/rcutorture
 +
  RDC R-321X SoC
  M:    Florian Fainelli <[email protected]>
  S:    Maintained
@@@ -7457,12 -7399,6 +7464,12 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/media/i2c/s5c73m3/*
  
 +SAMSUNG SOC CLOCK DRIVERS
 +M:    Tomasz Figa <[email protected]>
 +S:    Supported
 +L:    [email protected] (moderated for non-subscribers)
 +F:    drivers/clk/samsung/
 +
  SERIAL DRIVERS
  M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
@@@ -7534,7 -7470,7 +7541,7 @@@ S:      Maintaine
  F:    drivers/scsi/sr*
  
  SCSI RDMA PROTOCOL (SRP) INITIATOR
 -M:    David Dillow <[email protected]>
 +M:    Bart Van Assche <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://www.openfabrics.org
@@@ -7546,9 -7482,8 +7553,9 @@@ F:      include/scsi/srp.
  SCSI SG DRIVER
  M:    Doug Gilbert <[email protected]>
  L:    [email protected]
 -W:    http://www.torque.net/sg
 +W:    http://sg.danny.cz/sg
  S:    Maintained
 +F:    Documentation/scsi/scsi-generic.txt
  F:    drivers/scsi/sg.c
  F:    include/scsi/sg.h
  
@@@ -7610,7 -7545,7 +7617,7 @@@ S:      Maintaine
  F:    drivers/mmc/host/sdricoh_cs.c
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
 -M:    Chris Ball <c[email protected]>
 +M:    Chris Ball <c[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
  S:    Maintained
@@@ -7703,7 -7638,7 +7710,7 @@@ F:      drivers/net/ethernet/emulex/benet
  
  SFC NETWORK DRIVER
  M:    Solarflare linux maintainers <[email protected]>
 -M:    Ben Hutchings <bhutchings@solarflare.com>
 +M:    Shradha Shah <sshah@solarflare.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/sfc/
@@@ -8628,7 -8563,6 +8635,7 @@@ S:      Supporte
  F:      drivers/thermal/
  F:      include/linux/thermal.h
  F:      include/linux/cpu_cooling.h
 +F:      Documentation/devicetree/bindings/thermal/
  
  THINGM BLINK(1) USB RGB LED DRIVER
  M:    Vivien Didelot <[email protected]>
@@@ -8696,11 -8630,12 +8703,11 @@@ S:   Maintaine
  F:    sound/soc/codecs/twl4030*
  
  TI WILINK WIRELESS DRIVERS
 -M:    Luciano Coelho <[email protected]>
  L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/wl12xx
  W:    http://wireless.kernel.org/en/users/Drivers/wl1251
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
 -S:    Maintained
 +S:    Orphan
  F:    drivers/net/wireless/ti/
  F:    include/linux/wl12xx.h
  
@@@ -8769,6 -8704,7 +8776,6 @@@ F:      include/linux/toshiba.
  F:    include/uapi/linux/toshiba.h
  
  TMIO MMC DRIVER
 -M:    Guennadi Liakhovetski <[email protected]>
  M:    Ian Molton <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -8800,10 -8736,14 +8807,10 @@@ S:   Odd fixe
  F:    drivers/media/usb/tm6000/
  
  TPM DEVICE DRIVER
 -M:    Leonidas Da Silva Barbosa <[email protected]>
 -M:    Ashley Lai <[email protected]>
  M:    Peter Huewe <[email protected]>
 -M:    Rajiv Andrade <[email protected]>
 -W:    http://tpmdd.sourceforge.net
 +M:    Ashley Lai <[email protected]>
  M:    Marcel Selhorst <[email protected]>
 -M:    Sirrix AG <[email protected]>
 -W:    http://www.sirrix.com
 +W:    http://tpmdd.sourceforge.net
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/char/tpm/
@@@ -9293,7 -9233,6 +9300,7 @@@ F:      include/media/videobuf2-
  
  VIRTIO CONSOLE DRIVER
  M:    Amit Shah <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/char/virtio_console.c
@@@ -9303,7 -9242,6 +9310,7 @@@ F:      include/uapi/linux/virtio_console.
  VIRTIO CORE, NET AND BLOCK DRIVERS
  M:    Rusty Russell <[email protected]>
  M:    "Michael S. Tsirkin" <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/virtio/
@@@ -9316,7 -9254,6 +9323,7 @@@ F:      include/uapi/linux/virtio_*.
  VIRTIO HOST (VHOST)
  M:    "Michael S. Tsirkin" <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -9614,7 -9551,6 +9621,7 @@@ M:      Konrad Rzeszutek Wilk <konrad.wilk@o
  M:    Boris Ostrovsky <[email protected]>
  M:    David Vrabel <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
  S:    Supported
  F:    arch/x86/xen/
  F:    drivers/*/xen-*front.c

diff --combined drivers/mtd/maps/pxa2xx-flash.c
index 0f55589a56b815af4c00bc521c504db468774fa5,63b52f7080fa5d8d6070b54da988380f064544fb..9aad854fe9121aaa821181bffe64e819ec0e8498
--- 1/drivers/mtd/maps/pxa2xx-flash.c
--- 2/drivers/mtd/maps/pxa2xx-flash.c
+++ b/drivers/mtd/maps/pxa2xx-flash.c
@@@ -61,7 -61,7 +61,7 @@@ static int pxa2xx_flash_probe(struct pl
        if (!info)
                return -ENOMEM;
  
-       info->map.name = (char *) flash->name;
+       info->map.name = flash->name;
        info->map.bankwidth = flash->width;
        info->map.phys = res->start;
        info->map.size = resource_size(res);
@@@ -73,7 -73,7 +73,7 @@@
                return -ENOMEM;
        }
        info->map.cached =
 -              ioremap_cached(info->map.phys, info->map.size);
 +              ioremap_cache(info->map.phys, info->map.size);
        if (!info->map.cached)
                printk(KERN_WARNING "Failed to ioremap cached %s\n",
                       info->map.name);