Merge tag 'xtensa-next-20121008' of git://github.com/czankel/xtensa-linux

Pull Xtensa patchset from Chris Zankel:
 "The Xtensa tree has been broken for some time now, and this patchset
  brings it back to life.  It has been part of the linux-next tree for
  some time.

  Most changes are inside the xtensa subdirectory; the other changes
  mostly add another rule to already existing #ifdefs to exclude Xtensa,
  where required.  The only 'common' change is to add two more sections
  ('.xt.prop' and '.xt.lit') to the white list in modpost."

* tag 'xtensa-next-20121008' of git://github.com/czankel/xtensa-linux: (27 commits)
  xtensa: Setup CROSS_COMPILE at the top
  xtensa: drop CONFIG_EMBEDDED_RAMDISK
  xtensa: fix TIOCGSERIAL and TIOCSSERIAL definitions
  xtensa: provide dummy gcc intrinsics
  xtensa: add missing symbol exports
  parport: disable for xtensa arch
  xtensa: rename MISC SR definition to avoid name clashes
  hisax: disable build for big-endian xtensa
  xtensa: fix CODA build
  xtensa: fix parallel make
  xtensa: ISS: drop unused io.c
  xtensa: ISS: exit simulator in case of halt or poweroff
  xtensa: ISS: change keyboard polling rate
  xtensa: ISS: add platform_pcibios_init
  xtensa: ISS: add dummy serial.h for ISS platform
  xtensa: change default platform clock frequency to 10MHz
  xtensa: add ARCH_WANT_OPTIONAL_GPIOLIB to xtensa config
  xtensa: set NO_IOPORT to 'n' by default
  xtensa: adopt generic io routines
  xtensa: fix ioremap
  ...

diff --combined MAINTAINERS
index b4e5ecf,21e6baa..ab98a99
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -184,16 -184,6 +184,16 @@@ S:       Maintaine
  F:    Documentation/filesystems/9p.txt
  F:    fs/9p/
  
 +A8293 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/a8293*
 +
  AACRAID SCSI RAID DRIVER
  M:    Adaptec OEM Raid Solutions <aacraid@adaptec.com>
  L:    linux-scsi@vger.kernel.org
@@@ -401,26 -391,6 +401,26 @@@ M:       Riccardo Facchetti <fizban@tin.it
  S:    Maintained
  F:    sound/oss/aedsp16.c
  
 +AF9013 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/af9013*
 +
 +AF9033 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/af9033*
 +
  AFFS FILE SYSTEM
  L:    linux-fsdevel@vger.kernel.org
  S:    Orphan
@@@ -602,7 -572,7 +602,7 @@@ F: drivers/net/appletalk
  F:    net/appletalk/
  
  ARASAN COMPACT FLASH PATA CONTROLLER
 -M:     Viresh Kumar <viresh.linux@gmail.com>
 +M:    Viresh Kumar <viresh.linux@gmail.com>
  L:    linux-ide@vger.kernel.org
  S:    Maintained
  F:    include/linux/pata_arasan_cf_data.h
@@@ -625,6 -595,7 +625,6 @@@ M: Will Deacon <will.deacon@arm.com
  S:    Maintained
  F:    arch/arm/kernel/perf_event*
  F:    arch/arm/oprofile/common.c
 -F:    arch/arm/kernel/pmu.c
  F:    arch/arm/include/asm/pmu.h
  F:    arch/arm/kernel/hw_breakpoint.c
  F:    arch/arm/include/asm/hw_breakpoint.h
@@@ -687,6 -658,22 +687,6 @@@ W:        http://www.linux4sam.or
  S:    Supported
  F:    arch/arm/mach-at91/
  
 -ARM/BCMRING ARM ARCHITECTURE
 -M:    Jiandong Zheng <jdzheng@broadcom.com>
 -M:    Scott Branden <sbranden@broadcom.com>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-bcmring
 -
 -ARM/BCMRING MTD NAND DRIVER
 -M:    Jiandong Zheng <jdzheng@broadcom.com>
 -M:    Scott Branden <sbranden@broadcom.com>
 -L:    linux-mtd@lists.infradead.org
 -S:    Maintained
 -F:    drivers/mtd/nand/bcm_umi_nand.c
 -F:    drivers/mtd/nand/bcm_umi_bch.c
 -F:    drivers/mtd/nand/nand_bcm_umi.h
 -
  ARM/CALXEDA HIGHBANK ARCHITECTURE
  M:    Rob Herring <rob.herring@calxeda.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -790,7 -777,6 +790,7 @@@ S: Maintaine
  T:    git git://git.pengutronix.de/git/imx/linux-2.6.git
  F:    arch/arm/mach-imx/
  F:    arch/arm/plat-mxc/
 +F:    arch/arm/configs/imx*_defconfig
  
  ARM/FREESCALE IMX6
  M:    Shawn Guo <shawn.guo@linaro.org>
@@@ -927,12 -913,6 +927,12 @@@ W:       http://www.digriz.org.uk/ts78xx/kern
  S:    Maintained
  F:    arch/arm/mach-orion5x/ts78xx-*
  
 +ARM/MICREL KS8695 ARCHITECTURE
 +M:    Greg Ungerer <gerg@uclinux.org>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +F:    arch/arm/mach-ks8695
 +S:    Odd Fixes
 +
  ARM/MIOA701 MACHINE SUPPORT
  M:    Robert Jarzmik <robert.jarzmik@free.fr>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1093,7 -1073,7 +1093,7 @@@ L:      linux-media@vger.kernel.or
  S:    Maintained
  F:    arch/arm/plat-s5p/dev-fimc*
  F:    arch/arm/plat-samsung/include/plat/*fimc*
 -F:    drivers/media/video/s5p-fimc/
 +F:    drivers/media/platform/s5p-fimc/
  
  ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
  M:    Kyungmin Park <kyungmin.park@samsung.com>
@@@ -1103,7 -1083,7 +1103,7 @@@ L:      linux-arm-kernel@lists.infradead.or
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    arch/arm/plat-s5p/dev-mfc.c
 -F:    drivers/media/video/s5p-mfc/
 +F:    drivers/media/platform/s5p-mfc/
  
  ARM/SAMSUNG S5P SERIES TV SUBSYSTEM SUPPORT
  M:    Kyungmin Park <kyungmin.park@samsung.com>
@@@ -1111,7 -1091,7 +1111,7 @@@ M:      Tomasz Stanislawski <t.stanislaws@sa
  L:    linux-arm-kernel@lists.infradead.org
  L:    linux-media@vger.kernel.org
  S:    Maintained
 -F:    drivers/media/video/s5p-tv/
 +F:    drivers/media/platform/s5p-tv/
  
  ARM/SHMOBILE ARM ARCHITECTURE
  M:    Paul Mundt <lethal@linux-sh.org>
@@@ -1229,12 -1209,6 +1229,12 @@@ S:    Maintaine
  F:    arch/arm/mach-pxa/z2.c
  F:    arch/arm/mach-pxa/include/mach/z2.h
  
 +ARM64 PORT (AARCH64 ARCHITECTURE)
 +M:    Catalin Marinas <catalin.marinas@arm.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm64/
 +
  ASC7621 HARDWARE MONITOR DRIVER
  M:    George Joseph <george.joseph@fairview5.com>
  L:    lm-sensors@lm-sensors.org
@@@ -1276,7 -1250,7 +1276,7 @@@ F:      include/linux/i2c/at24.
  
  ATA OVER ETHERNET (AOE) DRIVER
  M:    "Ed L. Cashin" <ecashin@coraid.com>
 -W:    http://www.coraid.com/support/linux
 +W:    http://support.coraid.com/support/linux
  S:    Supported
  F:    Documentation/aoe/
  F:    drivers/block/aoe/
@@@ -1383,7 -1357,7 +1383,7 @@@ ATMEL ISI DRIVE
  M:    Josh Wu <josh.wu@atmel.com>
  L:    linux-media@vger.kernel.org
  S:    Supported
 -F:    drivers/media/video/atmel-isi.c
 +F:    drivers/media/platform/atmel-isi.c
  F:    include/media/atmel-isi.h
  
  ATMEL LCDFB DRIVER
@@@ -1639,16 -1613,6 +1639,16 @@@ L:    netdev@vger.kernel.or
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bnx2x/
  
 +BROADCOM BCM2835 ARM ARCHICTURE
 +M:    Stephen Warren <swarren@wwwdotorg.org>
 +L:    linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git
 +S:    Maintained
 +F:    arch/arm/mach-bcm2835/
 +F:    arch/arm/boot/dts/bcm2835*
 +F:    arch/arm/configs/bcm2835_defconfig
 +F:    drivers/*/*bcm2835*
 +
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
  M:    Matt Carlson <mcarlson@broadcom.com>
  M:    Michael Chan <mchan@broadcom.com>
@@@ -1681,6 -1645,7 +1681,6 @@@ F:      drivers/bcma
  F:    include/linux/bcma/
  
  BROCADE BFA FC SCSI DRIVER
 -M:    Jing Huang <huangj@brocade.com>
  M:    Krishna C Gudipati <kgudipat@brocade.com>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
@@@ -1730,7 -1695,7 +1730,7 @@@ W:      http://linuxtv.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    Documentation/video4linux/bttv/
 -F:    drivers/media/video/bt8xx/bttv*
 +F:    drivers/media/pci/bt8xx/bttv*
  
  C-MEDIA CMI8788 DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
@@@ -1760,7 -1725,7 +1760,7 @@@ L:      linux-media@vger.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    Documentation/video4linux/cafe_ccic
 -F:    drivers/media/video/marvell-ccic/
 +F:    drivers/media/platform/marvell-ccic/
  
  CAIF NETWORK LAYER
  M:    Sjur Braendeland <sjur.brandeland@stericsson.com>
@@@ -2149,17 -2114,7 +2149,17 @@@ W:    http://linuxtv.or
  W:    http://www.ivtvdriver.org/index.php/Cx18
  S:    Maintained
  F:    Documentation/video4linux/cx18.txt
 -F:    drivers/media/video/cx18/
 +F:    drivers/media/pci/cx18/
 +
 +CXD2820R MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/cxd2820r*
  
  CXGB3 ETHERNET DRIVER (CXGB3)
  M:    Divy Le Ray <divy@chelsio.com>
@@@ -2514,117 -2469,6 +2514,117 @@@ L:  netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/wan/dscc4.c
  
 +DVB_USB_AF9015 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/dvb-usb-v2/af9015*
 +
 +DVB_USB_AF9035 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/dvb-usb-v2/af9035*
 +
 +DVB_USB_ANYSEE MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/dvb-usb-v2/anysee*
 +
 +DVB_USB_AU6610 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/dvb-usb-v2/au6610*
 +
 +DVB_USB_CE6230 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/dvb-usb-v2/ce6230*
 +
 +DVB_USB_CXUSB MEDIA DRIVER
 +M:    Michael Krufky <mkrufky@linuxtv.org>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://github.com/mkrufky
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/dvb-usb-v2/cxusb*
 +
 +DVB_USB_CYPRESS_FIRMWARE MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/dvb-usb-v2/cypress_firmware*
 +
 +DVB_USB_EC168 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/dvb-usb-v2/ec168*
 +
 +DVB_USB_MXL111SF MEDIA DRIVER
 +M:    Michael Krufky <mkrufky@linuxtv.org>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://github.com/mkrufky
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/mkrufky/mxl111sf.git
 +S:    Maintained
 +F:    drivers/media/usb/dvb-usb-v2/mxl111sf*
 +
 +DVB_USB_RTL28XXU MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/dvb-usb-v2/rtl28xxu*
 +
 +DVB_USB_V2 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/dvb-usb-v2/dvb_usb*
 +F:    drivers/media/usb/dvb-usb-v2/usb_urb.c
 +
  DYNAMIC DEBUG
  M:    Jason Baron <jbaron@redhat.com>
  S:    Maintained
@@@ -2636,16 -2480,6 +2636,16 @@@ M:    "Maciej W. Rozycki" <macro@linux-mip
  S:    Maintained
  F:    drivers/tty/serial/dz.*
  
 +E4000 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/tuners/e4000*
 +
  EATA-DMA SCSI DRIVER
  M:    Michael Neuffer <mike@i-Connect.Net>
  L:    linux-eata@i-connect.net
@@@ -2674,16 -2508,6 +2674,16 @@@ S:    Maintaine
  F:    include/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
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/ec100*
 +
  ECRYPT FILE SYSTEM
  M:    Tyler Hicks <tyhicks@canonical.com>
  M:    Dustin Kirkland <dustin.kirkland@gazzang.com>
@@@ -2803,18 -2627,6 +2803,18 @@@ T:    git git://git.alsa-project.org/alsa-
  S:    Maintained
  F:    sound/usb/misc/ua101.c
  
 +EXTENSIBLE FIRMWARE INTERFACE (EFI)
 +M:    Matt Fleming <matt.fleming@intel.com>
 +L:    linux-efi@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/x86/efi-stub.txt
 +F:    arch/ia64/kernel/efi.c
 +F:    arch/x86/boot/compressed/eboot.[ch]
 +F:    arch/x86/include/asm/efi.h
 +F:    arch/x86/platform/efi/*
 +F:    drivers/firmware/efivars.c
 +F:    include/linux/efi*.h
 +
  EFIFB FRAMEBUFFER DRIVER
  L:    linux-fbdev@vger.kernel.org
  M:    Peter Jones <pjones@redhat.com>
@@@ -2966,18 -2778,8 +2966,18 @@@ FC0011 TUNER DRIVE
  M:    Michael Buesch <m@bues.ch>
  L:    linux-media@vger.kernel.org
  S:    Maintained
 -F:    drivers/media/common/tuners/fc0011.h
 -F:    drivers/media/common/tuners/fc0011.c
 +F:    drivers/media/tuners/fc0011.h
 +F:    drivers/media/tuners/fc0011.c
 +
 +FC2580 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/tuners/fc2580*
  
  FANOTIFY
  M:    Eric Paris <eparis@redhat.com>
@@@ -3057,9 -2859,7 +3057,9 @@@ F:      include/linux/firewire*.
  F:    tools/firewire/
  
  FIRMWARE LOADER (request_firmware)
 -S:    Orphan
 +M:    Ming Lei <ming.lei@canonical.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
  F:    Documentation/firmware_class/
  F:    drivers/base/firmware*.c
  F:    include/linux/firmware.h
@@@ -3207,7 -3007,7 +3207,7 @@@ M:      Kyungmin Park <kyungmin.park@samsung
  M:    Heungjun Kim <riverful.kim@samsung.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
 -F:    drivers/media/video/m5mols/
 +F:    drivers/media/i2c/m5mols/
  F:    include/media/m5mols.h
  
  FUJITSU TABLET EXTRAS
@@@ -3305,7 -3105,6 +3305,7 @@@ T:      git git://git.secretlab.ca/git/linux
  F:    Documentation/gpio.txt
  F:    drivers/gpio/
  F:    include/linux/gpio*
 +F:    include/asm-generic/gpio.h
  
  GRE DEMULTIPLEXER DRIVER
  M:    Dmitry Kozlov <xeb@mail.ru>
@@@ -3325,56 -3124,49 +3325,56 @@@ M:   Frank Zago <frank@zago.net
  L:    linux-media@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/gspca/finepix.c
 +F:    drivers/media/usb/gspca/finepix.c
  
  GSPCA GL860 SUBDRIVER
  M:    Olivier Lorin <o.lorin@laposte.net>
  L:    linux-media@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/gspca/gl860/
 +F:    drivers/media/usb/gspca/gl860/
  
  GSPCA M5602 SUBDRIVER
  M:    Erik Andren <erik.andren@gmail.com>
  L:    linux-media@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/gspca/m5602/
 +F:    drivers/media/usb/gspca/m5602/
  
  GSPCA PAC207 SONIXB SUBDRIVER
  M:    Hans de Goede <hdegoede@redhat.com>
  L:    linux-media@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/gspca/pac207.c
 +F:    drivers/media/usb/gspca/pac207.c
  
  GSPCA SN9C20X SUBDRIVER
  M:    Brian Johnson <brijohn@gmail.com>
  L:    linux-media@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/gspca/sn9c20x.c
 +F:    drivers/media/usb/gspca/sn9c20x.c
  
  GSPCA T613 SUBDRIVER
  M:    Leandro Costantino <lcostantino@gmail.com>
  L:    linux-media@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/gspca/t613.c
 +F:    drivers/media/usb/gspca/t613.c
  
  GSPCA USB WEBCAM DRIVER
  M:    Hans de Goede <hdegoede@redhat.com>
  L:    linux-media@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/gspca/
 +F:    drivers/media/usb/gspca/
 +
 +STK1160 USB VIDEO CAPTURE DRIVER
 +M:    Ezequiel Garcia <elezegarcia@gmail.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 +S:    Maintained
 +F:    drivers/media/usb/stk1160/
  
  HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
  M:    Frank Seidel <frank@f-seidel.de>
@@@ -3428,16 -3220,6 +3428,16 @@@ L:    linux-parisc@vger.kernel.or
  S:    Maintained
  F:    sound/parisc/harmony.*
  
 +HD29L2 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/hd29l2*
 +
  HEWLETT-PACKARD SMART2 RAID DRIVER
  M:    Chirag Kantharia <chirag.kantharia@hp.com>
  L:    iss_storagedev@hp.com
@@@ -3638,18 -3420,6 +3638,18 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    arch/ia64/
  
 +IBM Power in-Nest Crypto Acceleration
 +M:    Kent Yoder <key@linux.vnet.ibm.com>
 +L:    linux-crypto@vger.kernel.org
 +S:    Supported
 +F:    drivers/crypto/nx/
 +
 +IBM Power 842 compression accelerator
 +M:    Robert Jennings <rcj@linux.vnet.ibm.com>
 +S:    Supported
 +F:    drivers/crypto/nx/nx-842.c
 +F:    include/linux/nx842.h
 +
  IBM Power Linux RAID adapter
  M:    Brian King <brking@us.ibm.com>
  S:    Supported
@@@ -3661,13 -3431,6 +3661,13 @@@ L:    netdev@vger.kernel.or
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmveth.*
  
 +IBM Power Virtual SCSI/FC Device Drivers
 +M:    Robert Jennings <rcj@linux.vnet.ibm.com>
 +L:    linux-scsi@vger.kernel.org
 +S:    Supported
 +F:    drivers/scsi/ibmvscsi/
 +X:    drivers/scsi/ibmvscsi/ibmvstgt.c
 +
  IBM ServeRAID RAID DRIVER
  P:    Jack Hammer
  M:    Dave Jeffery <ipslinux@adaptec.com>
@@@ -4104,7 -3867,7 +4104,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  W:    http://www.ivtvdriver.org
  S:    Maintained
  F:    Documentation/video4linux/*.ivtv
 -F:    drivers/media/video/ivtv/
 +F:    drivers/media/pci/ivtv/
  F:    include/linux/ivtv*
  
  JC42.4 TEMPERATURE SENSOR DRIVER
@@@ -4398,26 -4161,6 +4398,26 @@@ W:    http://legousb.sourceforge.net
  S:    Maintained
  F:    drivers/usb/misc/legousbtower.c
  
 +LG2160 MEDIA DRIVER
 +M:    Michael Krufky <mkrufky@linuxtv.org>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://github.com/mkrufky
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/mkrufky/tuners.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/lg2160.*
 +
 +LGDT3305 MEDIA DRIVER
 +M:    Michael Krufky <mkrufky@linuxtv.org>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://github.com/mkrufky
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/mkrufky/tuners.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/lgdt3305.*
 +
  LGUEST
  M:    Rusty Russell <rusty@rustcorp.com.au>
  L:    lguest@lists.ozlabs.org
@@@ -4820,7 -4563,7 +4820,7 @@@ MOTION EYE VAIO PICTUREBOOK CAMERA DRIV
  W:    http://popies.net/meye/
  S:    Orphan
  F:    Documentation/video4linux/meye.txt
 -F:    drivers/media/video/meye.*
 +F:    drivers/media/pci/meye/
  F:    include/linux/meye.h
  
  MOTOROLA IMX MMC/SD HOST CONTROLLER INTERFACE DRIVER
@@@ -4884,16 -4627,6 +4884,16 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/usb/musb/
  
 +MXL5007T MEDIA DRIVER
 +M:    Michael Krufky <mkrufky@linuxtv.org>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://github.com/mkrufky
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/mkrufky/tuners.git
 +S:    Maintained
 +F:    drivers/media/tuners/mxl5007t.*
 +
  MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
  M:    Andrew Gallatin <gallatin@myri.com>
  L:    netdev@vger.kernel.org
@@@ -5066,7 -4799,6 +5066,7 @@@ M:      Lauro Ramos Venancio <lauro.venancio
  M:    Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
  M:    Samuel Ortiz <sameo@linux.intel.com>
  L:    linux-wireless@vger.kernel.org
 +L:    linux-nfc@lists.01.org (moderated for non-subscribers)
  S:    Maintained
  F:    net/nfc/
  F:    include/linux/nfc.h
@@@ -5234,7 -4966,7 +5234,7 @@@ OMAP IMAGE SIGNAL PROCESSOR (ISP
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
 -F:    drivers/media/video/omap3isp/*
 +F:    drivers/media/platform/omap3isp/
  
  OMAP USB SUPPORT
  M:    Felipe Balbi <balbi@ti.com>
@@@ -5275,7 -5007,7 +5275,7 @@@ M:      Jonathan Corbet <corbet@lwn.net
  L:    linux-media@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/ov7670.c
 +F:    drivers/media/i2c/ov7670.c
  
  ONENAND FLASH DRIVER
  M:    Kyungmin Park <kyungmin.park@samsung.com>
@@@ -5309,7 -5041,6 +5309,7 @@@ S:      Maintaine
  F:    Documentation/devicetree
  F:    drivers/of
  F:    include/linux/of*.h
 +F:    scripts/dtc
  K:    of_get_property
  K:    of_match_table
  
@@@ -5495,7 -5226,7 +5495,7 @@@ F:      include/linux/i2c-algo-pca.
  F:    include/linux/i2c-pca-platform.h
  
  PCDP - PRIMARY CONSOLE AND DEBUG PORT
 -M:    Khalid Aziz <khalid.aziz@hp.com>
 +M:    Khalid Aziz <khalid@gonehiking.org>
  S:    Maintained
  F:    drivers/firmware/pcdp.*
  
@@@ -5591,12 -5322,6 +5591,12 @@@ L:    linux-mtd@lists.infradead.or
  S:    Maintained
  F:    drivers/mtd/devices/phram.c
  
 +PICOLCD HID DRIVER
 +M:    Bruno Prémont <bonbons@linux-vserver.org>
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +F:    drivers/hid/hid-picolcd*
 +
  PICOXCELL SUPPORT
  M:    Jamie Iles <jamie@jamieiles.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -5778,25 -5503,13 +5778,25 @@@ L:   cbe-oss-dev@lists.ozlabs.or
  S:    Maintained
  F:    drivers/block/ps3vram.c
  
 +PSTORE FILESYSTEM
 +M:    Anton Vorontsov <cbouatmailru@gmail.com>
 +M:    Colin Cross <ccross@android.com>
 +M:    Kees Cook <keescook@chromium.org>
 +M:    Tony Luck <tony.luck@intel.com>
 +S:    Maintained
 +T:    git git://git.infradead.org/users/cbou/linux-pstore.git
 +F:    fs/pstore/
 +F:    include/linux/pstore*
 +F:    drivers/firmware/efivars.c
 +F:    drivers/acpi/apei/erst.c
 +
  PTP HARDWARE CLOCK SUPPORT
  M:    Richard Cochran <richardcochran@gmail.com>
  S:    Maintained
  W:    http://linuxptp.sourceforge.net/
  F:    Documentation/ABI/testing/sysfs-ptp
  F:    Documentation/ptp/*
 -F:    drivers/net/gianfar_ptp.c
 +F:    drivers/net/ethernet/freescale/gianfar_ptp.c
  F:    drivers/net/phy/dp83640*
  F:    drivers/ptp/*
  F:    include/linux/ptp_cl*
@@@ -5819,7 -5532,7 +5819,7 @@@ W:      http://www.isely.net/pvrusb2
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    Documentation/video4linux/README.pvrusb2
 -F:    drivers/media/video/pvrusb2/
 +F:    drivers/media/usb/pvrusb2/
  
  PWM SUBSYSTEM
  M:    Thierry Reding <thierry.reding@avionic-design.de>
@@@ -5929,16 -5642,6 +5929,16 @@@ F:    fs/qnx4
  F:    include/linux/qnx4_fs.h
  F:    include/linux/qnxtypes.h
  
 +QT1010 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/tuners/qt1010*
 +
  QUALCOMM HEXAGON ARCHITECTURE
  M:    Richard Kuo <rkuo@codeaurora.org>
  L:    linux-hexagon@vger.kernel.org
@@@ -6105,16 -5808,6 +6105,16 @@@ F:    include/linux/rose.
  F:    include/net/rose.h
  F:    net/rose/
  
 +RTL2830 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/rtl2830*
 +
  RTL8180 WIRELESS DRIVER
  M:    "John W. Linville" <linville@tuxdriver.com>
  L:    linux-wireless@vger.kernel.org
@@@ -6209,9 -5902,9 +6209,9 @@@ L:      linux-media@vger.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.mihu.de/linux/saa7146
  S:    Maintained
 -F:    drivers/media/common/saa7146*
 -F:    drivers/media/video/*7146*
 -F:    include/media/*7146*
 +F:    drivers/media/common/saa7146/
 +F:    drivers/media/pci/saa7146/
 +F:    include/media/saa7146*
  
  SAMSUNG LAPTOP DRIVER
  M:    Corentin Chary <corentincj@iksaif.net>
@@@ -6248,7 -5941,7 +6248,7 @@@ S:      Maintaine
  F:    drivers/tty/serial
  
  SYNOPSYS DESIGNWARE DMAC DRIVER
 -M:     Viresh Kumar <viresh.linux@gmail.com>
 +M:    Viresh Kumar <viresh.linux@gmail.com>
  S:    Maintained
  F:    include/linux/dw_dmac.h
  F:    drivers/dma/dw_dmac_regs.h
@@@ -6272,7 -5965,7 +6272,7 @@@ M:      Huang Shijie <shijie8@gmail.com
  M:    Kang Yong <kangyong@telegent.com>
  M:    Zhang Xiaobing <xbzhang@telegent.com>
  S:    Supported
 -F:    drivers/media/video/tlg2300
 +F:    drivers/media/usb/tlg2300
  
  SC1200 WDT DRIVER
  M:    Zwane Mwaikambo <zwane@arm.linux.org.uk>
@@@ -6396,7 -6089,7 +6396,7 @@@ S:      Maintaine
  F:    drivers/mmc/host/sdhci-s3c.c
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER
 -M:     Viresh Kumar <viresh.linux@gmail.com>
 +M:    Viresh Kumar <viresh.linux@gmail.com>
  L:    spear-devel@list.st.com
  L:    linux-mmc@vger.kernel.org
  S:    Maintained
@@@ -6660,9 -6353,8 +6660,9 @@@ M:      Guennadi Liakhovetski <g.liakhovetsk
  L:    linux-media@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    include/media/v4l2*
 -F:    drivers/media/video/v4l2*
 +F:    include/media/soc*
 +F:    drivers/media/i2c/soc_camera/
 +F:    drivers/media/platform/soc_camera/
  
  SOEKRIS NET48XX LED SUPPORT
  M:    Chris Boot <bootc@bootc.net>
@@@ -6762,7 -6454,7 +6762,7 @@@ S:      Maintaine
  F:    include/linux/compiler.h
  
  SPEAR PLATFORM SUPPORT
 -M:     Viresh Kumar <viresh.linux@gmail.com>
 +M:    Viresh Kumar <viresh.linux@gmail.com>
  M:    Shiraz Hashim <shiraz.hashim@st.com>
  L:    spear-devel@list.st.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -6771,7 -6463,7 +6771,7 @@@ S:      Maintaine
  F:    arch/arm/plat-spear/
  
  SPEAR13XX MACHINE SUPPORT
 -M:     Viresh Kumar <viresh.linux@gmail.com>
 +M:    Viresh Kumar <viresh.linux@gmail.com>
  M:    Shiraz Hashim <shiraz.hashim@st.com>
  L:    spear-devel@list.st.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -6780,7 -6472,7 +6780,7 @@@ S:      Maintaine
  F:    arch/arm/mach-spear13xx/
  
  SPEAR3XX MACHINE SUPPORT
 -M:     Viresh Kumar <viresh.linux@gmail.com>
 +M:    Viresh Kumar <viresh.linux@gmail.com>
  M:    Shiraz Hashim <shiraz.hashim@st.com>
  L:    spear-devel@list.st.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -6791,7 -6483,7 +6791,7 @@@ F:      arch/arm/mach-spear3xx
  SPEAR6XX MACHINE SUPPORT
  M:    Rajeev Kumar <rajeev-dlh.kumar@st.com>
  M:    Shiraz Hashim <shiraz.hashim@st.com>
 -M:     Viresh Kumar <viresh.linux@gmail.com>
 +M:    Viresh Kumar <viresh.linux@gmail.com>
  L:    spear-devel@list.st.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.st.com/spear
@@@ -6799,7 -6491,7 +6799,7 @@@ S:      Maintaine
  F:    arch/arm/mach-spear6xx/
  
  SPEAR CLOCK FRAMEWORK SUPPORT
 -M:     Viresh Kumar <viresh.linux@gmail.com>
 +M:    Viresh Kumar <viresh.linux@gmail.com>
  L:    spear-devel@list.st.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.st.com/spear
@@@ -7080,66 -6772,6 +7080,66 @@@ W:    http://tcp-lp-mod.sourceforge.net
  S:    Maintained
  F:    net/ipv4/tcp_lp.c
  
 +TDA10071 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/tda10071*
 +
 +TDA18212 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/tuners/tda18212*
 +
 +TDA18218 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/tuners/tda18218*
 +
 +TDA18271 MEDIA DRIVER
 +M:    Michael Krufky <mkrufky@linuxtv.org>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://github.com/mkrufky
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/mkrufky/tuners.git
 +S:    Maintained
 +F:    drivers/media/tuners/tda18271*
 +
 +TDA827x MEDIA DRIVER
 +M:    Michael Krufky <mkrufky@linuxtv.org>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://github.com/mkrufky
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/mkrufky/tuners.git
 +S:    Maintained
 +F:    drivers/media/tuners/tda8290.*
 +
 +TDA8290 MEDIA DRIVER
 +M:    Michael Krufky <mkrufky@linuxtv.org>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://github.com/mkrufky
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/mkrufky/tuners.git
 +S:    Maintained
 +F:    drivers/media/tuners/tda8290.*
 +
  TEAM DRIVER
  M:    Jiri Pirko <jpirko@redhat.com>
  L:    netdev@vger.kernel.org
@@@ -7148,14 -6780,14 +7148,14 @@@ F:   drivers/net/team
  F:    include/linux/if_team.h
  
  TEGRA SUPPORT
 -M:    Colin Cross <ccross@android.com>
 -M:    Olof Johansson <olof@lixom.net>
  M:    Stephen Warren <swarren@wwwdotorg.org>
  L:    linux-tegra@vger.kernel.org
  Q:    http://patchwork.ozlabs.org/project/linux-tegra/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
  S:    Supported
  F:    arch/arm/mach-tegra
 +F:    arch/arm/boot/dts/tegra*
 +F:    arch/arm/configs/tegra_defconfig
  
  TEHUTI ETHERNET DRIVER
  M:    Andy Gospodarek <andy@greyhouse.net>
@@@ -7170,6 -6802,8 +7170,8 @@@ F:      drivers/char/tlclk.
  
  TENSILICA XTENSA PORT (xtensa)
  M:    Chris Zankel <chris@zankel.net>
+ M:    Max Filippov <jcmvbkbc@gmail.com>
+ L:    linux-xtensa@linux-xtensa.org
  S:    Maintained
  F:    arch/xtensa/
  
@@@ -7330,16 -6964,6 +7332,16 @@@ F:    include/linux/serial_core.
  F:    include/linux/serial.h
  F:    include/linux/tty.h
  
 +TUA9001 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/tuners/tua9001*
 +
  TULIP NETWORK DRIVERS
  M:    Grant Grundler <grundler@parisc-linux.org>
  L:    netdev@vger.kernel.org
@@@ -7457,12 -7081,6 +7459,12 @@@ F:    drivers/mtd/ubi
  F:    include/linux/mtd/ubi.h
  F:    include/mtd/ubi-user.h
  
 +UNSORTED BLOCK IMAGES (UBI) Fastmap
 +M:    Richard Weinberger <richard@nod.at>
 +L:    linux-mtd@lists.infradead.org
 +S:    Maintained
 +F:    drivers/mtd/ubi/fastmap.c
 +
  USB ACM DRIVER
  M:    Oliver Neukum <oliver@neukum.org>
  L:    linux-usb@vger.kernel.org
@@@ -7518,6 -7136,15 +7520,6 @@@ S:     Maintaine
  F:    Documentation/usb/ehci.txt
  F:    drivers/usb/host/ehci*
  
 -USB ET61X[12]51 DRIVER
 -M:    Luca Risolia <luca.risolia@studio.unibo.it>
 -L:    linux-usb@vger.kernel.org
 -L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 -W:    http://www.linux-projects.org
 -S:    Maintained
 -F:    drivers/media/video/et61x251/
 -
  USB GADGET/PERIPHERAL SUBSYSTEM
  M:    Felipe Balbi <balbi@ti.com>
  L:    linux-usb@vger.kernel.org
@@@ -7687,7 -7314,7 +7689,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  W:    http://www.linux-projects.org
  S:    Maintained
  F:    Documentation/video4linux/sn9c102.txt
 -F:    drivers/media/video/sn9c102/
 +F:    drivers/media/usb/sn9c102/
  
  USB SUBSYSTEM
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@@@ -7722,7 -7349,17 +7724,7 @@@ L:     linux-media@vger.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.ideasonboard.org/uvc/
  S:    Maintained
 -F:    drivers/media/video/uvc/
 -
 -USB W996[87]CF DRIVER
 -M:    Luca Risolia <luca.risolia@studio.unibo.it>
 -L:    linux-usb@vger.kernel.org
 -L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 -W:    http://www.linux-projects.org
 -S:    Maintained
 -F:    Documentation/video4linux/w9968cf.txt
 -F:    drivers/media/video/w996*
 +F:    drivers/media/usb/uvc/
  
  USB WIRELESS RNDIS DRIVER (rndis_wlan)
  M:    Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
@@@ -7751,7 -7388,7 +7753,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  W:    http://royale.zerezo.com/zr364xx/
  S:    Maintained
  F:    Documentation/video4linux/zr364xx.txt
 -F:    drivers/media/video/zr364xx.c
 +F:    drivers/media/usb/zr364xx/
  
  USER-MODE LINUX (UML)
  M:    Jeff Dike <jdike@addtoit.com>
@@@ -7809,7 -7446,7 +7811,7 @@@ M:      Marek Szyprowski <m.szyprowski@samsu
  M:    Kyungmin Park <kyungmin.park@samsung.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
 -F:    drivers/media/video/videobuf2-*
 +F:    drivers/media/v4l2-core/videobuf2-*
  F:    include/media/videobuf2-*
  
  VIRTIO CONSOLE DRIVER
@@@ -8121,13 -7758,6 +8123,13 @@@ F:    drivers/xen
  F:    arch/x86/include/asm/xen/
  F:    include/xen/
  
 +XEN HYPERVISOR ARM
 +M:    Stefano Stabellini <stefano.stabellini@eu.citrix.com>
 +L:    xen-devel@lists.xensource.com (moderated for non-subscribers)
 +S:    Supported
 +F:    arch/arm/xen/
 +F:    arch/arm/include/asm/xen/
 +
  XEN NETWORK BACKEND DRIVER
  M:    Ian Campbell <ian.campbell@citrix.com>
  L:    xen-devel@lists.xensource.com (moderated for non-subscribers)
@@@ -8218,7 -7848,7 +8220,7 @@@ L:      linux-media@vger.kernel.or
  W:    http://mjpeg.sourceforge.net/driver-zoran/
  T:    Mercurial http://linuxtv.org/hg/v4l-dvb
  S:    Odd Fixes
 -F:    drivers/media/video/zoran/
 +F:    drivers/media/pci/zoran/
  
  ZS DECSTATION Z85C30 SERIAL DRIVER
  M:    "Maciej W. Rozycki" <macro@linux-mips.org>

diff --combined arch/xtensa/Kconfig
index 744f5ee,cebbcfb..cdcb48a
--- 1/arch/xtensa/Kconfig
--- 2/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@@ -11,6 -11,9 +11,9 @@@ config XTENS
        select HAVE_GENERIC_HARDIRQS
        select GENERIC_IRQ_SHOW
        select GENERIC_CPU_DEVICES
+       select MODULES_USE_ELF_RELA
+       select GENERIC_PCI_IOMAP
+       select ARCH_WANT_OPTIONAL_GPIOLIB
        help
          Xtensa processors are 32-bit RISC machines designed by Tensilica
          primarily for embedded systems.  These processors are both
@@@ -35,7 -38,7 +38,7 @@@ config ARCH_HAS_ILOG2_U6
        def_bool n
  
  config NO_IOPORT
-       def_bool y
+       def_bool n
  
  config HZ
        int
@@@ -142,6 -145,7 +145,7 @@@ config XTENSA_PLATFORM_XT200
  config XTENSA_PLATFORM_S6105
        bool "S6105"
        select SERIAL_CONSOLE
+       select NO_IOPORT
  
  endchoice
  
@@@ -172,6 -176,24 +176,6 @@@ config CMDLIN
  
  source "mm/Kconfig"
  
 -config HOTPLUG
 -      bool "Support for hot-pluggable devices"
 -      help
 -        Say Y here if you want to plug devices into your computer while
 -        the system is running, and be able to use them quickly.  In many
 -        cases, the devices can likewise be unplugged at any time too.
 -
 -        One well known example of this is PCMCIA- or PC-cards, credit-card
 -        size devices such as network cards, modems or hard drives which are
 -        plugged into slots found on all modern laptop computers.  Another
 -        example, used on modern desktops as well as laptops, is USB.
 -
 -        Enable HOTPLUG and build a modular kernel.  Get agent software
 -        (from <http://linux-hotplug.sourceforge.net/>) and install it.
 -        Then your kernel will automatically call out to a user mode "policy
 -        agent" (/sbin/hotplug) to load modules and set up software needed
 -        to use devices as you hotplug them.
 -
  source "drivers/pcmcia/Kconfig"
  
  source "drivers/pci/hotplug/Kconfig"
@@@ -205,23 -227,6 +209,6 @@@ source "drivers/Kconfig
  
  source "fs/Kconfig"
  
- menu "Xtensa initrd options"
-       depends on BLK_DEV_INITRD
- 
- config EMBEDDED_RAMDISK
-       bool "Embed root filesystem ramdisk into the kernel"
- 
- config EMBEDDED_RAMDISK_IMAGE
-       string "Filename of gzipped ramdisk image"
-       depends on EMBEDDED_RAMDISK
-       default "ramdisk.gz"
-       help
-         This is the filename of the ramdisk image to be built into the
-         kernel.  Relative pathnames are relative to arch/xtensa/boot/ramdisk/.
-         The ramdisk image is not part of the kernel distribution; you must
-         provide one yourself.
- endmenu
- 
  source "arch/xtensa/Kconfig.debug"
  
  source "security/Kconfig"

diff --combined arch/xtensa/kernel/pci.c
index 54354de,43e9fdc..126c188
--- 1/arch/xtensa/kernel/pci.c
--- 2/arch/xtensa/kernel/pci.c
+++ b/arch/xtensa/kernel/pci.c
@@@ -210,6 -210,14 +210,6 @@@ void pcibios_set_master(struct pci_dev 
        /* No special bus mastering setup handling */
  }
  
 -/* the next one is stolen from the alpha port... */
 -
 -void __init
 -pcibios_update_irq(struct pci_dev *dev, int irq)
 -{
 -      pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
 -}
 -
  int pcibios_enable_device(struct pci_dev *dev, int mask)
  {
        u16 cmd, old_cmd;
@@@ -333,7 -341,7 +333,7 @@@ __pci_mmap_set_pgprot(struct pci_dev *d
        int prot = pgprot_val(vma->vm_page_prot);
  
        /* Set to write-through */
-       prot &= ~_PAGE_NO_CACHE;
+       prot = (prot & _PAGE_CA_MASK) | _PAGE_CA_WT;
  #if 0
        if (!write_combine)
                prot |= _PAGE_WRITETHRU;

diff --combined arch/xtensa/platforms/iss/console.c
index 2cd3d3a,3fc1522..8ab47ed
--- 1/arch/xtensa/platforms/iss/console.c
--- 2/arch/xtensa/platforms/iss/console.c
+++ b/arch/xtensa/platforms/iss/console.c
@@@ -33,7 -33,7 +33,7 @@@
  #endif
  
  #define SERIAL_MAX_NUM_LINES 1
- #define SERIAL_TIMER_VALUE (20 * HZ)
+ #define SERIAL_TIMER_VALUE (HZ / 10)
  
  static struct tty_driver *serial_driver;
  static struct tty_port serial_port;
@@@ -41,19 -41,6 +41,6 @@@ static struct timer_list serial_timer
  
  static DEFINE_SPINLOCK(timer_lock);
  
- int errno;
- 
- static int __simc (int a, int b, int c, int d, int e, int f) __attribute__((__noinline__));
- static int __simc (int a, int b, int c, int d, int e, int f)
- {
-       int ret;
-       __asm__ __volatile__ ("simcall\n"
-                       "mov %0, a2\n"
-                       "mov %1, a3\n" : "=a" (ret), "=a" (errno)
-                       : : "a2", "a3");
-       return ret;
- }
- 
  static char *serial_version = "0.1";
  static char *serial_name = "ISS serial driver";
  
@@@ -223,7 -210,6 +210,7 @@@ int __init rs_init(void
        serial_driver->flags = TTY_DRIVER_REAL_RAW;
  
        tty_set_operations(serial_driver, &serial_ops);
 +      tty_port_link_device(&serial_port, serial_driver, 0);
  
        if (tty_register_driver(serial_driver))
                panic("Couldn't register serial driver\n");