Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

Pull media updates from Mauro Carvalho Chehab:
 "This is the first part of the media patches for v3.6.

  This patch series contain:
   - new DVB frontend: rtl2832
   - new video drivers: adv7393
   - some unused files got removed
   - a selection API cleanup between V4L2 and V4L2 subdev API's
   - a major redesign at v4l-ioctl2, in order to clean it up
   - several driver fixes and improvements."

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (174 commits)
  v4l: Export v4l2-common.h in include/linux/Kbuild
  media: Revert "[media] Terratec Cinergy S2 USB HD Rev.2"
  [media] media: Use pr_info not homegrown pr_reg macro
  [media] Terratec Cinergy S2 USB HD Rev.2
  [media] v4l: Correct conflicting V4L2 subdev selection API documentation
  [media] Feature removal: V4L2 selections API target and flag definitions
  [media] v4l: Unify selection flags documentation
  [media] v4l: Unify selection flags
  [media] v4l: Common documentation for selection targets
  [media] v4l: Unify selection targets across V4L2 and V4L2 subdev interfaces
  [media] v4l: Remove "_ACTUAL" from subdev selection API target definition names
  [media] V4L: Remove "_ACTIVE" from the selection target name definitions
  [media] media: dvb-usb: print mac address via native %pM
  [media] s5p-tv: Use module_i2c_driver in sii9234_drv.c file
  [media] media: gpio-ir-recv: add allowed_protos for platform data
  [media] s5p-jpeg: Use module_platform_driver in jpeg-core.c file
  [media] saa7134: fix spelling of detach in label
  [media] cx88-blackbird: replace ioctl by unlocked_ioctl
  [media] cx88: don't use current_norm
  [media] cx88: fix a number of v4l2-compliance violations
  ...

diff --combined Documentation/feature-removal-schedule.txt
index 76112dac76592f4454fbdb20d43437079aef6c92,b99803066b7b17a2cc2c885071a7f69c7b224832..e9237fb719507abe070064c7fc62848e7307748d
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -2,14 -2,7 +2,14 @@@ The following is a list of files and fe
  removed in the kernel source tree.  Every entry should contain what
  exactly is going away, why it is happening, and who is going to be doing
  the work.  When the feature is removed from the kernel, it should also
 -be removed from this file.
 +be removed from this file.  The suggested deprecation period is 3 releases.
 +
 +---------------------------
 +
 +What: ddebug_query="query" boot cmdline param
 +When: v3.8
 +Why:  obsoleted by dyndbg="query" and module.dyndbg="query"
 +Who:  Jim Cromie <jim.cromie@gmail.com>, Jason Baron <jbaron@redhat.com>
  
  ---------------------------
  
@@@ -249,6 -242,15 +249,6 @@@ Who:      Ravikiran Thirumalai <kiran@scalex
  
  ---------------------------
  
 -What: Code that is now under CONFIG_WIRELESS_EXT_SYSFS
 -      (in net/core/net-sysfs.c)
 -When: 3.5
 -Why:  Over 1K .text/.data size reduction, data is available in other
 -      ways (ioctls)
 -Who:  Johannes Berg <johannes@sipsolutions.net>
 -
 ----------------------------
 -
  What: sysfs ui for changing p4-clockmod parameters
  When: September 2009
  Why:  See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and
@@@ -405,6 -407,21 +405,6 @@@ Who:      Jean Delvare <khali@linux-fr.org
  
  ----------------------------
  
 -What: xt_connlimit rev 0
 -When: 2012
 -Who:  Jan Engelhardt <jengelh@medozas.de>
 -Files:        net/netfilter/xt_connlimit.c
 -
 -----------------------------
 -
 -What: ipt_addrtype match include file
 -When: 2012
 -Why:  superseded by xt_addrtype
 -Who:  Florian Westphal <fw@strlen.de>
 -Files:        include/linux/netfilter_ipv4/ipt_addrtype.h
 -
 -----------------------------
 -
  What: i2c_driver.attach_adapter
        i2c_driver.detach_adapter
  When: September 2011
@@@ -425,19 -442,6 +425,19 @@@ Who:     Hans Verkuil <hans.verkuil@cisco.c
  
  ----------------------------
  
 +What: CONFIG_CFG80211_WEXT
 +When: as soon as distributions ship new wireless tools, ie. wpa_supplicant 1.0
 +      and NetworkManager/connman/etc. that are able to use nl80211
 +Why:  Wireless extensions are deprecated, and userland tools are moving to
 +      using nl80211. New drivers are no longer using wireless extensions,
 +      and while there might still be old drivers, both new drivers and new
 +      userland no longer needs them and they can't be used for an feature
 +      developed in the past couple of years. As such, compatibility with
 +      wireless extensions in new drivers will be removed.
 +Who:  Johannes Berg <johannes@sipsolutions.net>
 +
 +----------------------------
 +
  What: g_file_storage driver
  When: 3.8
  Why:  This driver has been superseded by g_mass_storage.
@@@ -512,6 -516,14 +512,6 @@@ Who:      Sebastian Andrzej Siewior <sebasti
  
  ----------------------------
  
 -What: kmap_atomic(page, km_type)
 -When: 3.5
 -Why:  The old kmap_atomic() with two arguments is deprecated, we only
 -      keep it for backward compatibility for few cycles and then drop it.
 -Who:  Cong Wang <amwang@redhat.com>
 -
 -----------------------------
 -
  What: get_robust_list syscall
  When: 2013
  Why:  There appear to be no production users of the get_robust_list syscall,
@@@ -522,18 -534,6 +522,18 @@@ Who:     Kees Cook <keescook@chromium.org
  
  ----------------------------
  
 +What: Removing the pn544 raw driver.
 +When: 3.6
 +Why:  With the introduction of the NFC HCI and SHDL kernel layers, pn544.c
 +      is being replaced by pn544_hci.c which is accessible through the netlink
 +      and socket NFC APIs. Moreover, pn544.c is outdated and does not seem to
 +      work properly with the latest Android stacks.
 +      Having 2 drivers for the same hardware is confusing and as such we
 +      should only keep the one following the kernel NFC APIs.
 +Who:  Samuel Ortiz <sameo@linux.intel.com>
 +
 +----------------------------
 +
  What: setitimer accepts user NULL pointer (value)
  When: 3.6
  Why:  setitimer is not returning -EFAULT if user pointer is NULL. This
@@@ -561,42 -561,18 +561,60 @@@ Who:    Sylwester Nawrocki <sylvester.nawr
  
  ----------------------------
  
 +What: cgroup option updates via remount
 +When: March 2013
 +Why:  Remount currently allows changing bound subsystems and
 +      release_agent.  Rebinding is hardly useful as it only works
 +      when the hierarchy is empty and release_agent itself should be
 +      replaced with conventional fsnotify.
 +
 +----------------------------
 +
 +What:  xt_recent rev 0
 +When:  2013
 +Who:   Pablo Neira Ayuso <pablo@netfilter.org>
 +Files: net/netfilter/xt_recent.c
 +
 +----------------------------
 +
 +What: KVM debugfs statistics
 +When: 2013
 +Why:  KVM tracepoints provide mostly equivalent information in a much more
 +        flexible fashion.
 +
 +----------------------------
 +
 +What: at91-mci driver ("CONFIG_MMC_AT91")
 +When: 3.7
 +Why:  There are two mci drivers: at91-mci and atmel-mci. The PDC support
 +      was added to atmel-mci as a first step to support more chips.
 +      Then at91-mci was kept only for old IP versions (on at91rm9200 and
 +      at91sam9261). The support of these IP versions has just been added
 +      to atmel-mci, so atmel-mci can be used for all chips.
 +Who:  Ludovic Desroches <ludovic.desroches@atmel.com>
 +
 +----------------------------
 +
 +What: net/wanrouter/
 +When: June 2013
 +Why:  Unsupported/unmaintained/unused since 2.6
 +
 +----------------------------
++
+ What: V4L2 selections API target rectangle and flags unification, the
+       following definitions will be removed: V4L2_SEL_TGT_CROP_ACTIVE,
+       V4L2_SEL_TGT_COMPOSE_ACTIVE, V4L2_SUBDEV_SEL_*, V4L2_SUBDEV_SEL_FLAG_*
+       in favor of common V4L2_SEL_TGT_* and V4L2_SEL_FLAG_* definitions.
+       For more details see include/linux/v4l2-common.h.
+ When: 3.8
+ Why:  The regular V4L2 selections and the subdev selection API originally
+       defined distinct names for the target rectangles and flags - V4L2_SEL_*
+       and V4L2_SUBDEV_SEL_*. Although, it turned out that the meaning of these
+       target rectangles is virtually identical and the APIs were consolidated
+       to use single set of names - V4L2_SEL_*. This didn't involve any ABI
+       changes. Alias definitions were created for the original ones to avoid
+       any instabilities in the user space interface. After few cycles these
+       backward compatibility definitions will be removed.
+ Who:  Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
++
++----------------------------

diff --combined MAINTAINERS
index b2e3d88ff4cd94f5fcfb6112c7a9793dec1d7c58,aaa63da72ab61d581a8e6de6e6a0ef5169f49a91..fb036a062a5d3e3c7eefae83f3cb87d718483fcf
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -242,6 -242,13 +242,6 @@@ W:        http://www.lesswatts.org/projects/ac
  S:    Supported
  F:    drivers/acpi/fan.c
  
 -ACPI PROCESSOR AGGREGATOR DRIVER
 -M:    Shaohua Li <shaohua.li@intel.com>
 -L:    linux-acpi@vger.kernel.org
 -W:    http://www.lesswatts.org/projects/acpi/
 -S:    Supported
 -F:    drivers/acpi/acpi_pad.c
 -
  ACPI THERMAL DRIVER
  M:    Zhang Rui <rui.zhang@intel.com>
  L:    linux-acpi@vger.kernel.org
@@@ -322,7 -329,7 +322,7 @@@ F: drivers/hwmon/adm1029.
  
  ADM8211 WIRELESS DRIVER
  L:    linux-wireless@vger.kernel.org
 -W:    http://linuxwireless.org/
 +W:    http://wireless.kernel.org/
  S:    Orphan
  F:    drivers/net/wireless/adm8211.*
  
@@@ -572,7 -579,7 +572,7 @@@ F: drivers/net/appletalk
  F:    net/appletalk/
  
  ARASAN COMPACT FLASH PATA CONTROLLER
 -M:    Viresh Kumar <viresh.kumar@st.com>
 +M:     Viresh Kumar <viresh.linux@gmail.com>
  L:    linux-ide@vger.kernel.org
  S:    Maintained
  F:    include/linux/pata_arasan_cf_data.h
@@@ -633,6 -640,13 +633,6 @@@ S:        Maintaine
  F:    drivers/amba/
  F:    include/linux/amba/bus.h
  
 -ARM/ADI ROADRUNNER MACHINE SUPPORT
 -M:    Lennert Buytenhek <kernel@wantstofly.org>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-ixp23xx/
 -F:    arch/arm/mach-ixp23xx/include/mach/
 -
  ARM/ADS SPHERE MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -732,10 -746,7 +732,10 @@@ M:       Barry Song <baohua.song@csr.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-prima2/
 -F:    drivers/dma/sirf-dma*
 +F:    drivers/dma/sirf-dma.c
 +F:    drivers/i2c/busses/i2c-sirf.c
 +F:    drivers/pinctrl/pinctrl-sirf.c
 +F:    drivers/spi/spi-sirf.c
  
  ARM/EBSA110 MACHINE SUPPORT
  M:    Russell King <linux@arm.linux.org.uk>
@@@ -848,11 -859,21 +848,11 @@@ M:      Dan Williams <dan.j.williams@intel.c
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
 -ARM/INTEL IXP2000 ARM ARCHITECTURE
 -M:    Lennert Buytenhek <kernel@wantstofly.org>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -
  ARM/INTEL IXDP2850 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
 -ARM/INTEL IXP23XX ARM ARCHITECTURE
 -M:    Lennert Buytenhek <kernel@wantstofly.org>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -
  ARM/INTEL IXP4XX ARM ARCHITECTURE
  M:    Imre Kaloz <kaloz@openwrt.org>
  M:    Krzysztof Halasa <khc@pm.waw.pl>
@@@ -887,20 -908,11 +887,20 @@@ ARM/MAGICIAN MACHINE SUPPOR
  M:    Philipp Zabel <philipp.zabel@gmail.com>
  S:    Maintained
  
 -ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support
 -M:    Lennert Buytenhek <kernel@wantstofly.org>
 -M:    Nicolas Pitre <nico@fluxnic.net>
 +ARM/Marvell Armada 370 and Armada XP SOC support
 +M:    Jason Cooper <jason@lakedaemon.net>
 +M:    Andrew Lunn <andrew@lunn.ch>
 +M:    Gregory Clement <gregory.clement@free-electrons.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Odd Fixes
 +S:    Maintained
 +F:    arch/arm/mach-mvebu/
 +
 +ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
 +M:    Jason Cooper <jason@lakedaemon.net>
 +M:    Andrew Lunn <andrew@lunn.ch>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-dove/
  F:    arch/arm/mach-kirkwood/
  F:    arch/arm/mach-mv78xx0/
  F:    arch/arm/mach-orion5x/
@@@ -1078,7 -1090,7 +1078,7 @@@ F:      drivers/media/video/s5p-fimc
  ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
  M:    Kyungmin Park <kyungmin.park@samsung.com>
  M:    Kamil Debski <k.debski@samsung.com>
 -M:     Jeongtae Park <jtp.park@samsung.com>
 +M:    Jeongtae Park <jtp.park@samsung.com>
  L:    linux-arm-kernel@lists.infradead.org
  L:    linux-media@vger.kernel.org
  S:    Maintained
@@@ -1104,16 -1116,6 +1104,16 @@@ S:    Supporte
  F:    arch/arm/mach-shmobile/
  F:    drivers/sh/
  
 +ARM/SOCFPGA ARCHITECTURE
 +M:    Dinh Nguyen <dinguyen@altera.com>
 +S:    Maintained
 +F:    arch/arm/mach-socfpga/
 +
 +ARM/SOCFPGA CLOCK FRAMEWORK SUPPORT
 +M:    Dinh Nguyen <dinguyen@altera.com>
 +S:    Maintained
 +F:    drivers/clk/socfpga/
 +
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1186,17 -1188,6 +1186,17 @@@ S:    Maintaine
  F:    arch/arm/mach-pxa/vpac270.c
  F:    arch/arm/mach-pxa/include/mach/vpac270.h
  
 +ARM/VT8500 ARM ARCHITECTURE
 +M:    Tony Prisk <linux@prisktech.co.nz>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-vt8500/
 +F:    drivers/video/vt8500lcdfb.*
 +F:    drivers/video/wm8505fb*
 +F:    drivers/video/wmt_ge_rops.*
 +F:    drivers/tty/serial/vt8500_serial.c
 +F:    drivers/rtc/rtc-vt8500-c
 +
  ARM/ZIPIT Z2 SUPPORT
  M:    Marek Vasut <marek.vasut@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1340,21 -1331,6 +1340,21 @@@ M:    Nicolas Ferre <nicolas.ferre@atmel.c
  S:    Supported
  F:    drivers/tty/serial/atmel_serial.c
  
 +ATMEL DMA DRIVER
 +M:    Nicolas Ferre <nicolas.ferre@atmel.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/dma/at_hdmac.c
 +F:    drivers/dma/at_hdmac_regs.h
 +F:    arch/arm/mach-at91/include/mach/at_hdmac.h
 +
 +ATMEL ISI DRIVER
 +M:    Josh Wu <josh.wu@atmel.com>
 +L:    linux-media@vger.kernel.org
 +S:    Supported
 +F:    drivers/media/video/atmel-isi.c
 +F:    include/media/atmel-isi.h
 +
  ATMEL LCDFB DRIVER
  M:    Nicolas Ferre <nicolas.ferre@atmel.com>
  L:    linux-fbdev@vger.kernel.org
@@@ -1372,22 -1348,10 +1372,22 @@@ M:   Nicolas Ferre <nicolas.ferre@atmel.c
  S:    Supported
  F:    drivers/spi/spi-atmel.*
  
 +ATMEL Timer Counter (TC) AND CLOCKSOURCE DRIVERS
 +M:    Nicolas Ferre <nicolas.ferre@atmel.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/misc/atmel_tclib.c
 +F:    drivers/clocksource/tcb_clksrc.c
 +
 +ATMEL TSADCC DRIVER
 +M:    Josh Wu <josh.wu@atmel.com>
 +L:    linux-input@vger.kernel.org
 +S:    Supported
 +F:    drivers/input/touchscreen/atmel_tsadcc.c
 +
  ATMEL USBA UDC DRIVER
  M:    Nicolas Ferre <nicolas.ferre@atmel.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -W:    http://avr32linux.org/twiki/bin/view/Main/AtmelUsbDeviceDriver
  S:    Supported
  F:    drivers/usb/gadget/atmel_usba_udc.*
  
@@@ -1445,7 -1409,7 +1445,7 @@@ B43 WIRELESS DRIVE
  M:    Stefano Brivio <stefano.brivio@polimi.it>
  L:    linux-wireless@vger.kernel.org
  L:    b43-dev@lists.infradead.org
 -W:    http://linuxwireless.org/en/users/Drivers/b43
 +W:    http://wireless.kernel.org/en/users/Drivers/b43
  S:    Maintained
  F:    drivers/net/wireless/b43/
  
@@@ -1454,7 -1418,7 +1454,7 @@@ M:      Larry Finger <Larry.Finger@lwfinger.
  M:    Stefano Brivio <stefano.brivio@polimi.it>
  L:    linux-wireless@vger.kernel.org
  L:    b43-dev@lists.infradead.org
 -W:    http://linuxwireless.org/en/users/Drivers/b43
 +W:    http://wireless.kernel.org/en/users/Drivers/b43
  S:    Maintained
  F:    drivers/net/wireless/b43legacy/
  
@@@ -1467,7 -1431,6 +1467,7 @@@ F:      include/linux/backlight.
  BATMAN ADVANCED
  M:    Marek Lindner <lindner_marek@yahoo.de>
  M:    Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
 +M:    Antonio Quartulli <ordex@autistici.org>
  L:    b.a.t.m.a.n@lists.open-mesh.org
  W:    http://www.open-mesh.org/
  S:    Maintained
@@@ -1540,11 -1503,6 +1540,11 @@@ W:    http://blackfin.uclinux.org
  S:    Supported
  F:    drivers/i2c/busses/i2c-bfin-twi.c
  
 +BLINKM RGB LED DRIVER
 +M:    Jan-Simon Moeller <jansimon.moeller@gmx.de>
 +S:    Maintained
 +F:    drivers/leds/leds-blinkm.c
 +
  BLOCK LAYER
  M:    Jens Axboe <axboe@kernel.dk>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
@@@ -1622,7 -1580,6 +1622,7 @@@ M:      Arend van Spriel <arend@broadcom.com
  M:    Franky (Zhenhui) Lin <frankyl@broadcom.com>
  M:    Kan Yan <kanyan@broadcom.com>
  L:    linux-wireless@vger.kernel.org
 +L:    brcm80211-dev-list@broadcom.com
  S:    Supported
  F:    drivers/net/wireless/brcm80211/
  
@@@ -1641,7 -1598,6 +1641,7 @@@ 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
  F:    drivers/scsi/bfa/
@@@ -1674,11 -1630,11 +1674,11 @@@ S:   Maintaine
  F:    drivers/gpio/gpio-bt8xx.c
  
  BTRFS FILE SYSTEM
 -M:    Chris Mason <chris.mason@oracle.com>
 +M:    Chris Mason <chris.mason@fusionio.com>
  L:    linux-btrfs@vger.kernel.org
  W:    http://btrfs.wiki.kernel.org/
  Q:    http://patchwork.kernel.org/project/linux-btrfs/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git
  S:    Maintained
  F:    Documentation/filesystems/btrfs.txt
  F:    fs/btrfs/
@@@ -1771,11 -1727,10 +1771,11 @@@ F:   include/linux/can/platform
  CAPABILITIES
  M:    Serge Hallyn <serge.hallyn@canonical.com>
  L:    linux-security-module@vger.kernel.org
 -S:    Supported       
 +S:    Supported
  F:    include/linux/capability.h
  F:    security/capability.c
 -F:    security/commoncap.c 
 +F:    security/commoncap.c
 +F:    kernel/capability.c
  
  CELL BROADBAND ENGINE ARCHITECTURE
  M:    Arnd Bergmann <arnd@arndb.de>
@@@ -1828,9 -1783,6 +1828,9 @@@ F:      include/linux/cfag12864b.
  CFG80211 and NL80211
  M:    Johannes Berg <johannes@sipsolutions.net>
  L:    linux-wireless@vger.kernel.org
 +W:    http://wireless.kernel.org/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
  S:    Maintained
  F:    include/linux/nl80211.h
  F:    include/net/cfg80211.h
@@@ -1857,12 -1809,6 +1857,12 @@@ L:    linux-kernel@zh-kernel.org (moderate
  S:    Maintained
  F:    Documentation/zh_CN/
  
 +CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
 +M:    Alexander Shishkin <alexander.shishkin@linux.intel.com>
 +L:    linux-usb@vger.kernel.org
 +S:    Maintained
 +F:    drivers/usb/chipidea/
 +
  CISCO VIC ETHERNET NIC DRIVER
  M:    Christian Benvenuti <benve@cisco.com>
  M:    Roopa Prabhu <roprabhu@cisco.com>
@@@ -1936,16 -1882,6 +1936,16 @@@ F:    Documentation/filesystems/coda.tx
  F:    fs/coda/
  F:    include/linux/coda*.h
  
 +COMMON CLK FRAMEWORK
 +M:    Mike Turquette <mturquette@ti.com>
 +M:    Mike Turquette <mturquette@linaro.org>
 +L:    linux-arm-kernel@lists.infradead.org (same as CLK API & CLKDEV)
 +T:    git git://git.linaro.org/people/mturquette/linux.git
 +S:    Maintained
 +F:    drivers/clk/clk.c
 +F:    drivers/clk/clk-*
 +F:    include/linux/clk-pr*
 +
  COMMON INTERNET FILE SYSTEM (CIFS)
  M:    Steve French <sfrench@samba.org>
  L:    linux-cifs@vger.kernel.org
@@@ -2177,11 -2113,11 +2177,11 @@@ S:   Orpha
  F:    drivers/net/wan/pc300*
  
  CYTTSP TOUCHSCREEN DRIVER
 -M:      Javier Martinez Canillas <javier@dowhile0.org>
 -L:      linux-input@vger.kernel.org
 -S:      Maintained
 -F:      drivers/input/touchscreen/cyttsp*
 -F:      include/linux/input/cyttsp.h
 +M:    Javier Martinez Canillas <javier@dowhile0.org>
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +F:    drivers/input/touchscreen/cyttsp*
 +F:    include/linux/input/cyttsp.h
  
  DAMA SLAVE for AX.25
  M:    Joerg Reuter <jreuter@yaina.de>
@@@ -2301,7 -2237,7 +2301,7 @@@ F:      include/linux/device-mapper.
  F:    include/linux/dm-*.h
  
  DIOLAN U2C-12 I2C DRIVER
 -M:    Guenter Roeck <guenter.roeck@ericsson.com>
 +M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
  F:    drivers/i2c/busses/i2c-diolan-u2c.c
@@@ -2439,10 -2375,10 +2439,10 @@@ F:   drivers/gpu/drm
  F:    include/drm/
  
  INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
 -M:    Keith Packard <keithp@keithp.com>
 +M:    Daniel Vetter <daniel.vetter@ffwll.ch>
  L:    intel-gfx@lists.freedesktop.org (subscribers-only)
  L:    dri-devel@lists.freedesktop.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux.git
 +T:    git git://people.freedesktop.org/~danvet/drm-intel
  S:    Supported
  F:    drivers/gpu/drm/i915
  F:    include/drm/i915*
@@@ -2737,20 -2673,11 +2737,20 @@@ M:   Mimi Zohar <zohar@us.ibm.com
  S:    Supported
  F:    security/integrity/evm/
  
 +EXTERNAL CONNECTOR SUBSYSTEM (EXTCON)
 +M:    MyungJoo Ham <myungjoo.ham@samsung.com>
 +M:    Chanwoo Choi <cw00.choi@samsung.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    drivers/extcon/
 +F:    Documentation/extcon/
 +
  EXYNOS DP DRIVER
  M:    Jingoo Han <jg1.han@samsung.com>
  L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/exynos/exynos_dp*
 +F:    include/video/exynos_dp*
  
  EXYNOS MIPI DISPLAY DRIVERS
  M:    Inki Dae <inki.dae@samsung.com>
@@@ -2833,15 -2760,6 +2833,15 @@@ T:    git git://git.alsa-project.org/alsa-
  S:    Maintained
  F:    sound/firewire/
  
 +FIREWIRE SBP-2 TARGET
 +M:    Chris Boot <bootc@bootc.net>
 +L:    linux-scsi@vger.kernel.org
 +L:    target-devel@vger.kernel.org
 +L:    linux1394-devel@lists.sourceforge.net
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nab/lio-core-2.6.git master
 +S:    Maintained
 +F:    drivers/target/sbp/
 +
  FIREWIRE SUBSYSTEM
  M:    Stefan Richter <stefanr@s5r6.in-berlin.de>
  L:    linux1394-devel@lists.sourceforge.net
@@@ -2858,12 -2776,6 +2858,12 @@@ F:    Documentation/firmware_class
  F:    drivers/base/firmware*.c
  F:    include/linux/firmware.h
  
 +FLOPPY DRIVER
 +M:    Jiri Kosina <jkosina@suse.cz>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git
 +S:    Odd fixes
 +F:    drivers/block/floppy.c
 +
  FPU EMULATOR
  M:    Bill Metzenthen <billm@melbpc.org.au>
  W:    http://floatingpoint.sourceforge.net/emulator/index.html
@@@ -2970,13 -2882,6 +2970,13 @@@ F:    Documentation/power/freezing-of-task
  F:    include/linux/freezer.h
  F:    kernel/freezer.c
  
 +FRONTSWAP API
 +M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    mm/frontswap.c
 +F:    include/linux/frontswap.h
 +
  FS-CACHE: LOCAL CACHING FOR NETWORK FILESYSTEMS
  M:    David Howells <dhowells@redhat.com>
  L:    linux-cachefs@redhat.com
@@@ -2991,7 -2896,7 +2991,7 @@@ S:      Maintaine
  F:    arch/frv/
  
  FUJITSU LAPTOP EXTRAS
 -M:    Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
 +M:    Jonathan Woithe <jwoithe@just42.net>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    drivers/platform/x86/fujitsu-laptop.c
@@@ -3041,9 -2946,9 +3041,9 @@@ GENERIC GPIO I2C MULTIPLEXER DRIVE
  M:    Peter Korsgaard <peter.korsgaard@barco.com>
  L:    linux-i2c@vger.kernel.org
  S:    Supported
 -F:    drivers/i2c/muxes/gpio-i2cmux.c
 -F:    include/linux/gpio-i2cmux.h
 -F:    Documentation/i2c/muxes/gpio-i2cmux
 +F:    drivers/i2c/muxes/i2c-mux-gpio.c
 +F:    include/linux/i2c-mux-gpio.h
 +F:    Documentation/i2c/muxes/i2c-mux-gpio
  
  GENERIC HDLC (WAN) DRIVERS
  M:    Krzysztof Halasa <khc@pm.waw.pl>
@@@ -3156,8 -3061,7 +3156,7 @@@ S:      Maintaine
  F:    drivers/media/video/gspca/t613.c
  
  GSPCA USB WEBCAM DRIVER
- M:    Jean-Francois Moine <moinejf@free.fr>
- W:    http://moinejf.free.fr
+ 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
@@@ -3185,7 -3089,7 +3184,7 @@@ F:      drivers/tty/hvc
  
  HARDWARE MONITORING
  M:    Jean Delvare <khali@linux-fr.org>
 -M:    Guenter Roeck <guenter.roeck@ericsson.com>
 +M:    Guenter Roeck <linux@roeck-us.net>
  L:    lm-sensors@lm-sensors.org
  W:    http://www.lm-sensors.org/
  T:    quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/
@@@ -3285,8 -3189,10 +3284,8 @@@ F:     include/linux/clockchips.
  F:    include/linux/hrtimer.h
  
  HIGH-SPEED SCC DRIVER FOR AX.25
 -M:    Klaus Kudielka <klaus.kudielka@ieee.org>
  L:    linux-hams@vger.kernel.org
 -W:    http://www.nt.tuwien.ac.at/~kkudielk/Linux/
 -S:    Maintained
 +S:    Orphan
  F:    drivers/net/hamradio/dmascc.c
  F:    drivers/net/hamradio/scc.c
  
@@@ -3415,6 -3321,12 +3414,6 @@@ T:     git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    arch/ia64/
  
 -IBM MCA SCSI SUBSYSTEM DRIVER
 -M:    Michael Lang <langa2@kph.uni-mainz.de>
 -W:    http://www.uni-mainz.de/~langm000/linux.html
 -S:    Maintained
 -F:    drivers/scsi/ibmmca.c
 -
  IBM Power Linux RAID adapter
  M:    Brian King <brking@us.ibm.com>
  S:    Supported
@@@ -3433,12 -3345,6 +3432,12 @@@ W:    http://www.developer.ibm.com/welcome
  S:    Supported
  F:    drivers/scsi/ips.*
  
 +ICH LPC AND GPIO DRIVER
 +M:    Peter Tyser <ptyser@xes-inc.com>
 +S:    Maintained
 +F:    drivers/mfd/lpc_ich.c
 +F:    drivers/gpio/gpio-ich.c
 +
  IDE SUBSYSTEM
  M:    "David S. Miller" <davem@davemloft.net>
  L:    linux-ide@vger.kernel.org
@@@ -3470,21 -3376,19 +3469,21 @@@ 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:    Sergey Lapin <slapin@ossfans.org>
  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
  S:    Maintained
  F:    net/ieee802154/
 +F:    net/mac802154/
  F:    drivers/ieee802154/
  
  IIO SUBSYSTEM AND DRIVERS
  M:    Jonathan Cameron <jic23@cam.ac.uk>
  L:    linux-iio@vger.kernel.org
  S:    Maintained
 +F:    drivers/iio/
  F:    drivers/staging/iio/
  
  IKANOS/ADI EAGLE ADSL USB DRIVER
@@@ -3533,8 -3437,6 +3532,8 @@@ Q:      http://patchwork.kernel.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
  S:    Maintained
  F:    drivers/input/
 +F:    include/linux/input.h
 +F:    include/linux/input/
  
  INPUT MULTITOUCH (MT) PROTOCOL
  M:    Henrik Rydberg <rydberg@euromail.se>
@@@ -3622,6 -3524,12 +3621,6 @@@ M:     Deepak Saxena <dsaxena@plexity.net
  S:    Maintained
  F:    drivers/char/hw_random/ixp4xx-rng.c
  
 -INTEL IXP2000 ETHERNET DRIVER
 -M:    Lennert Buytenhek <kernel@wantstofly.org>
 -L:    netdev@vger.kernel.org
 -S:    Maintained
 -F:    drivers/net/ethernet/xscale/ixp2000/
 -
  INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf)
  M:    Jeff Kirsher <jeffrey.t.kirsher@intel.com>
  M:    Jesse Brandeburg <jesse.brandeburg@intel.com>
@@@ -3698,13 -3606,13 +3697,13 @@@ T:   git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/net/wireless/iwlwifi/
  
 -INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi)
 -M:    Samuel Ortiz <samuel.ortiz@intel.com>
 -M:    Intel Linux Wireless <ilw@linux.intel.com>
 -L:    linux-wireless@vger.kernel.org
 +INTEL MANAGEMENT ENGINE (mei)
 +M:    Tomas Winkler <tomas.winkler@intel.com>
 +L:    linux-kernel@vger.kernel.org
  S:    Supported
 -W:    http://wireless.kernel.org/en/users/Drivers/iwmc3200wifi
 -F:    drivers/net/wireless/iwmc3200wifi/
 +F:    include/linux/mei.h
 +F:    drivers/misc/mei/*
 +F:    Documentation/mei/*
  
  IOC3 ETHERNET DRIVER
  M:    Ralf Baechle <ralf@linux-mips.org>
@@@ -3731,7 -3639,7 +3730,7 @@@ S:      Maintaine
  F:    drivers/net/ethernet/icplus/ipg.*
  
  IPATH DRIVER
 -M:    Mike Marciniszyn <infinipath@qlogic.com>
 +M:    Mike Marciniszyn <infinipath@intel.com>
  L:    linux-rdma@vger.kernel.org
  S:    Maintained
  F:    drivers/infiniband/hw/ipath/
@@@ -4020,8 -3928,8 +4019,8 @@@ F:      arch/ia64/include/asm/kvm
  F:    arch/ia64/kvm/
  
  KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
 -M:    Carsten Otte <cotte@de.ibm.com>
  M:    Christian Borntraeger <borntraeger@de.ibm.com>
 +M:    Cornelia Huck <cornelia.huck@de.ibm.com>
  M:    linux390@de.ibm.com
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -4136,8 -4044,6 +4135,8 @@@ F:      drivers/scsi/53c700
  LED SUBSYSTEM
  M:    Bryan Wu <bryan.wu@canonical.com>
  M:    Richard Purdie <rpurdie@rpsys.net>
 +L:    linux-leds@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git
  S:    Maintained
  F:    drivers/leds/
  F:    include/linux/leds.h
@@@ -4381,9 -4287,8 +4380,9 @@@ F:      arch/m68k/hp300
  MAC80211
  M:    Johannes Berg <johannes@sipsolutions.net>
  L:    linux-wireless@vger.kernel.org
 -W:    http://linuxwireless.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
 +W:    http://wireless.kernel.org/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
  S:    Maintained
  F:    Documentation/networking/mac80211-injection.txt
  F:    include/net/mac80211.h
@@@ -4393,9 -4298,8 +4392,9 @@@ MAC80211 PID RATE CONTRO
  M:    Stefano Brivio <stefano.brivio@polimi.it>
  M:    Mattias Nissler <mattias.nissler@gmx.de>
  L:    linux-wireless@vger.kernel.org
 -W:    http://linuxwireless.org/en/developers/Documentation/mac80211/RateControl/PID
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
 +W:    http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
  S:    Maintained
  F:    net/mac80211/rc80211_pid*
  
@@@ -4455,13 -4359,6 +4454,13 @@@ S:    Orpha
  F:    drivers/video/matrox/matroxfb_*
  F:    include/linux/matroxfb.h
  
 +MAX16065 HARDWARE MONITOR DRIVER
 +M:    Guenter Roeck <linux@roeck-us.net>
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +F:    Documentation/hwmon/max16065
 +F:    drivers/hwmon/max16065.c
 +
  MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  M:    "Hans J. Koch" <hjk@hansjkoch.de>
  L:    lm-sensors@lm-sensors.org
@@@ -4532,6 -4429,13 +4531,6 @@@ T:     git git://git.monstr.eu/linux-2.6-mi
  S:    Supported
  F:    arch/microblaze/
  
 -MICROCHANNEL ARCHITECTURE (MCA)
 -M:    James Bottomley <James.Bottomley@HansenPartnership.com>
 -S:    Maintained
 -F:    Documentation/mca.txt
 -F:    drivers/mca/
 -F:    include/linux/mca*
 -
  MICROTEK X6 SCANNER
  M:    Oliver Neukum <oliver@neukum.name>
  S:    Maintained
@@@ -4566,6 -4470,12 +4565,6 @@@ L:     linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    drivers/mmc/host/imxmmc.*
  
 -MOUSE AND MISC DEVICES [GENERAL]
 -M:    Alessandro Rubini <rubini@ipvvis.unipv.it>
 -S:    Maintained
 -F:    drivers/input/mouse/
 -F:    include/linux/gpio_mouse.h
 -
  MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
  M:    Jiri Slaby <jirislaby@gmail.com>
  S:    Maintained
@@@ -4622,6 -4532,7 +4621,6 @@@ S:      Maintaine
  F:    drivers/usb/musb/
  
  MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
 -M:    Jon Mason <mason@myri.com>
  M:    Andrew Gallatin <gallatin@myri.com>
  L:    netdev@vger.kernel.org
  W:    http://www.myri.com/scs/download-Myri10GE.html
@@@ -4666,6 -4577,8 +4665,6 @@@ F:      net/sched/sch_netem.
  NETERION 10GbE DRIVERS (s2io/vxge)
  M:    Jon Mason <jdmason@kudzu.us>
  L:    netdev@vger.kernel.org
 -W:    http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
 -W:    http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
  S:    Supported
  F:    Documentation/networking/s2io.txt
  F:    Documentation/networking/vxge.txt
@@@ -4681,8 -4594,8 +4680,8 @@@ L:      netfilter@vger.kernel.or
  L:    coreteam@netfilter.org
  W:    http://www.netfilter.org/
  W:    http://www.iptables.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-2.6.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next-2.6.git
 +T:    git git://1984.lsi.us.es/nf
 +T:    git git://1984.lsi.us.es/nf-next
  S:    Supported
  F:    include/linux/netfilter*
  F:    include/linux/netfilter/
@@@ -4884,7 -4797,6 +4883,7 @@@ M:      Kevin Hilman <khilman@ti.com
  L:    linux-omap@vger.kernel.org
  S:    Maintained
  F:    arch/arm/*omap*/*pm*
 +F:    drivers/cpufreq/omap-cpufreq.c
  
  OMAP POWERDOMAIN/CLOCKDOMAIN SOC ADAPTATION LAYER SUPPORT
  M:    Rajendra Nayak <rnayak@ti.com>
@@@ -4971,13 -4883,6 +4970,13 @@@ S:    Maintaine
  F:    drivers/usb/*/*omap*
  F:    arch/arm/*omap*/usb*
  
 +OMAP GPIO DRIVER
 +M:    Santosh Shilimkar <santosh.shilimkar@ti.com>
 +M:    Kevin Hilman <khilman@ti.com>
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
 +F:    drivers/gpio/gpio-omap.c
 +
  OMFS FILESYSTEM
  M:    Bob Copeland <me@bobcopeland.com>
  L:    linux-karma-devel@lists.sourceforge.net
@@@ -5083,7 -4988,7 +5082,7 @@@ F:      fs/ocfs2
  
  ORINOCO DRIVER
  L:    linux-wireless@vger.kernel.org
 -W:    http://linuxwireless.org/en/users/Drivers/orinoco
 +W:    http://wireless.kernel.org/en/users/Drivers/orinoco
  W:    http://www.nongnu.org/orinoco/
  S:    Orphan
  F:    drivers/net/wireless/orinoco/
@@@ -5205,10 -5110,10 +5204,10 @@@ F:   drivers/leds/leds-pca9532.
  F:    include/linux/leds-pca9532.h
  
  PCA9541 I2C BUS MASTER SELECTOR DRIVER
 -M:    Guenter Roeck <guenter.roeck@ericsson.com>
 +M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
 -F:    drivers/i2c/muxes/pca9541.c
 +F:    drivers/i2c/muxes/i2c-mux-pca9541.c
  
  PCA9564/PCA9665 I2C BUS DRIVER
  M:    Wolfram Sang <w.sang@pengutronix.de>
@@@ -5225,7 -5130,7 +5224,7 @@@ S:      Maintaine
  F:    drivers/firmware/pcdp.*
  
  PCI ERROR RECOVERY
 -M:     Linas Vepstas <linasvepstas@gmail.com>
 +M:    Linas Vepstas <linasvepstas@gmail.com>
  L:    linux-pci@vger.kernel.org
  S:    Supported
  F:    Documentation/PCI/pci-error-recovery.txt
@@@ -5234,13 -5139,19 +5233,13 @@@ F:   Documentation/powerpc/eeh-pci-error-
  PCI SUBSYSTEM
  M:    Bjorn Helgaas <bhelgaas@google.com>
  L:    linux-pci@vger.kernel.org
 -Q:    http://patchwork.kernel.org/project/linux-pci/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci.git
 +Q:    http://patchwork.ozlabs.org/project/linux-pci/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git
  S:    Supported
  F:    Documentation/PCI/
  F:    drivers/pci/
  F:    include/linux/pci*
  
 -PCI HOTPLUG
 -M:    Bjorn Helgaas <bhelgaas@google.com>
 -L:    linux-pci@vger.kernel.org
 -S:    Supported
 -F:    drivers/pci/hotplug
 -
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    linux-pcmcia@lists.infradead.org
@@@ -5303,7 -5214,7 +5302,7 @@@ S:      Maintaine
  F:    include/linux/personality.h
  
  PHONET PROTOCOL
 -M:    Remi Denis-Courmont <remi.denis-courmont@nokia.com>
 +M:    Remi Denis-Courmont <courmisch@gmail.com>
  S:    Supported
  F:    Documentation/networking/phonet.txt
  F:    include/linux/phonet.h
@@@ -5330,14 -5241,6 +5329,14 @@@ M:    Linus Walleij <linus.walleij@linaro.
  S:    Maintained
  F:    drivers/pinctrl/
  
 +PIN CONTROLLER - ST SPEAR
 +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
 +S:    Maintained
 +F:    driver/pinctrl/spear/
 +
  PKTCDVD DRIVER
  M:    Peter Osterlund <petero2@telia.com>
  S:    Maintained
@@@ -5355,7 -5258,7 +5354,7 @@@ F:      drivers/video/fb-puv3.
  F:    drivers/rtc/rtc-puv3.c
  
  PMBUS HARDWARE MONITORING DRIVERS
 -M:    Guenter Roeck <guenter.roeck@ericsson.com>
 +M:    Guenter Roeck <linux@roeck-us.net>
  L:    lm-sensors@lm-sensors.org
  W:    http://www.lm-sensors.org/
  W:    http://www.roeck-us.net/linux/drivers/
@@@ -5393,7 -5296,7 +5392,7 @@@ M:      David Woodhouse <dwmw2@infradead.org
  T:    git git://git.infradead.org/battery-2.6.git
  S:    Maintained
  F:    include/linux/power_supply.h
 -F:    drivers/power/power_supply*
 +F:    drivers/power/
  
  PNP SUPPORT
  M:    Adam Belay <abelay@mit.edu>
@@@ -5527,18 -5430,6 +5526,18 @@@ S:    Maintaine
  F:    Documentation/video4linux/README.pvrusb2
  F:    drivers/media/video/pvrusb2/
  
 +PWM SUBSYSTEM
 +M:    Thierry Reding <thierry.reding@avionic-design.de>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +W:    http://gitorious.org/linux-pwm
 +T:    git git://gitorious.org/linux-pwm/linux-pwm.git
 +F:    Documentation/pwm.txt
 +F:    Documentation/devicetree/bindings/pwm/
 +F:    include/linux/pwm.h
 +F:    include/linux/of_pwm.h
 +F:    drivers/pwm/
 +
  PXA2xx/PXA3xx SUPPORT
  M:    Eric Miao <eric.y.miao@gmail.com>
  M:    Russell King <linux@arm.linux.org.uk>
@@@ -5573,7 -5464,7 +5572,7 @@@ L:      rtc-linux@googlegroups.co
  S:    Maintained
  
  QIB DRIVER
 -M:    Mike Marciniszyn <infinipath@qlogic.com>
 +M:    Mike Marciniszyn <infinipath@intel.com>
  L:    linux-rdma@vger.kernel.org
  S:    Supported
  F:    drivers/infiniband/hw/qib/
@@@ -5610,7 -5501,7 +5609,7 @@@ F:      Documentation/networking/LICENSE.qla
  F:    drivers/net/ethernet/qlogic/qla3xxx.*
  
  QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
 -M:    Anirban Chakraborty <anirban.chakraborty@qlogic.com>
 +M:    Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
  M:    Sony Chacko <sony.chacko@qlogic.com>
  M:    linux-driver@qlogic.com
  L:    netdev@vger.kernel.org
@@@ -5618,6 -5509,7 +5617,6 @@@ S:      Supporte
  F:    drivers/net/ethernet/qlogic/qlcnic/
  
  QLOGIC QLGE 10Gb ETHERNET DRIVER
 -M:    Anirban Chakraborty <anirban.chakraborty@qlogic.com>
  M:    Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
  M:    Ron Mercer <ron.mercer@qlogic.com>
  M:    linux-driver@qlogic.com
@@@ -5722,13 -5614,14 +5721,13 @@@ F:   net/rds
  READ-COPY UPDATE (RCU)
  M:    Dipankar Sarma <dipankar@in.ibm.com>
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 -W:    http://www.rdrop.com/users/paulmck/rclock/
 +W:    http://www.rdrop.com/users/paulmck/RCU/
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
  F:    Documentation/RCU/
 +X:    Documentation/RCU/torture.txt
  F:    include/linux/rcu*
 -F:    include/linux/srcu*
  F:    kernel/rcu*
 -F:    kernel/srcu*
  X:    kernel/rcutorture.c
  
  REAL TIME CLOCK (RTC) SUBSYSTEM
@@@ -5754,7 -5647,6 +5753,7 @@@ F:      include/linux/regmap.
  
  REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
  M:    Ohad Ben-Cohen <ohad@wizery.com>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git
  S:    Maintained
  F:    drivers/remoteproc/
  F:    Documentation/remoteproc.txt
@@@ -5763,9 -5655,6 +5762,9 @@@ F:      include/linux/remoteproc.
  RFKILL
  M:    Johannes Berg <johannes@sipsolutions.net>
  L:    linux-wireless@vger.kernel.org
 +W:    http://wireless.kernel.org/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
  S:    Maintained
  F:    Documentation/rfkill.txt
  F:    net/rfkill/
@@@ -5800,7 -5689,7 +5799,7 @@@ F:      net/rose
  RTL8180 WIRELESS DRIVER
  M:    "John W. Linville" <linville@tuxdriver.com>
  L:    linux-wireless@vger.kernel.org
 -W:    http://linuxwireless.org/
 +W:    http://wireless.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  S:    Maintained
  F:    drivers/net/wireless/rtl818x/rtl8180/
@@@ -5810,7 -5699,7 +5809,7 @@@ M:      Herton Ronaldo Krzesinski <herton@ca
  M:    Hin-Tak Leung <htl10@users.sourceforge.net>
  M:    Larry Finger <Larry.Finger@lwfinger.net>
  L:    linux-wireless@vger.kernel.org
 -W:    http://linuxwireless.org/
 +W:    http://wireless.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  S:    Maintained
  F:    drivers/net/wireless/rtl818x/rtl8187/
@@@ -5819,7 -5708,7 +5818,7 @@@ RTL8192CE WIRELESS DRIVE
  M:    Larry Finger <Larry.Finger@lwfinger.net>
  M:    Chaoming Li <chaoming_li@realsil.com.cn>
  L:    linux-wireless@vger.kernel.org
 -W:    http://linuxwireless.org/
 +W:    http://wireless.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  S:    Maintained
  F:    drivers/net/wireless/rtlwifi/
@@@ -5913,16 -5802,6 +5912,16 @@@ L:    linux-fbdev@vger.kernel.or
  S:    Maintained
  F:    drivers/video/s3c-fb.c
  
 +SAMSUNG MULTIFUNCTION DEVICE DRIVERS
 +M:    Sangbeom Kim <sbkim73@samsung.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Supported
 +F:    drivers/mfd/sec*.c
 +F:    drivers/regulator/s2m*.c
 +F:    drivers/regulator/s5m*.c
 +F:    drivers/rtc/rtc-sec.c
 +F:    include/linux/mfd/samsung/
 +
  SERIAL DRIVERS
  M:    Alan Cox <alan@linux.intel.com>
  L:    linux-serial@vger.kernel.org
@@@ -5930,7 -5809,7 +5929,7 @@@ S:      Maintaine
  F:    drivers/tty/serial
  
  SYNOPSYS DESIGNWARE DMAC DRIVER
 -M:    Viresh Kumar <viresh.kumar@st.com>
 +M:     Viresh Kumar <viresh.linux@gmail.com>
  S:    Maintained
  F:    include/linux/dw_dmac.h
  F:    drivers/dma/dw_dmac_regs.h
@@@ -5966,7 -5845,7 +5965,7 @@@ M:      Ingo Molnar <mingo@redhat.com
  M:    Peter Zijlstra <peterz@infradead.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
  S:    Maintained
 -F:    kernel/sched*
 +F:    kernel/sched/
  F:    include/linux/sched.h
  
  SCORE ARCHITECTURE
@@@ -6078,7 -5957,7 +6077,7 @@@ S:      Maintaine
  F:    drivers/mmc/host/sdhci-s3c.c
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER
 -M:    Viresh Kumar <viresh.kumar@st.com>
 +M:     Viresh Kumar <viresh.linux@gmail.com>
  L:    spear-devel@list.st.com
  L:    linux-mmc@vger.kernel.org
  S:    Maintained
@@@ -6088,7 -5967,7 +6087,7 @@@ SECURITY SUBSYSTE
  M:    James Morris <james.l.morris@oracle.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://security.wiki.kernel.org/
 +W:    http://kernsec.org/
  S:    Supported
  F:    security/
  
@@@ -6259,24 -6138,6 +6258,24 @@@ S:    Maintaine
  F:    include/linux/sl?b*.h
  F:    mm/sl?b.c
  
 +SLEEPABLE READ-COPY UPDATE (SRCU)
 +M:    Lai Jiangshan <laijs@cn.fujitsu.com>
 +M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 +W:    http://www.rdrop.com/users/paulmck/RCU/
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 +F:    include/linux/srcu*
 +F:    kernel/srcu*
 +
 +SMACK SECURITY MODULE
 +M:    Casey Schaufler <casey@schaufler-ca.com>
 +L:    linux-security-module@vger.kernel.org
 +W:    http://schaufler-ca.com
 +T:    git git://git.gitorious.org/smack-next/kernel.git
 +S:    Maintained
 +F:    Documentation/security/Smack.txt
 +F:    security/smack/
 +
  SMC91x ETHERNET DRIVER
  M:    Nicolas Pitre <nico@fluxnic.net>
  S:    Odd Fixes
@@@ -6290,9 -6151,9 +6289,9 @@@ F:      Documentation/hwmon/smm66
  F:    drivers/hwmon/smm665.c
  
  SMSC EMC2103 HARDWARE MONITOR DRIVER
 -M:    Steve Glendinning <steve.glendinning@smsc.com>
 +M:    Steve Glendinning <steve.glendinning@shawell.net>
  L:    lm-sensors@lm-sensors.org
 -S:    Supported
 +S:    Maintained
  F:    Documentation/hwmon/emc2103
  F:    drivers/hwmon/emc2103.c
  
@@@ -6311,22 -6172,22 +6310,22 @@@ F:   Documentation/hwmon/smsc47b39
  F:    drivers/hwmon/smsc47b397.c
  
  SMSC911x ETHERNET DRIVER
 -M:    Steve Glendinning <steve.glendinning@smsc.com>
 +M:    Steve Glendinning <steve.glendinning@shawell.net>
  L:    netdev@vger.kernel.org
 -S:    Supported
 +S:    Maintained
  F:    include/linux/smsc911x.h
  F:    drivers/net/ethernet/smsc/smsc911x.*
  
  SMSC9420 PCI ETHERNET DRIVER
 -M:    Steve Glendinning <steve.glendinning@smsc.com>
 +M:    Steve Glendinning <steve.glendinning@shawell.net>
  L:    netdev@vger.kernel.org
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/smsc/smsc9420.*
  
  SMSC UFX6000 and UFX7000 USB to VGA DRIVER
 -M:    Steve Glendinning <steve.glendinning@smsc.com>
 +M:    Steve Glendinning <steve.glendinning@shawell.net>
  L:    linux-fbdev@vger.kernel.org
 -S:    Supported
 +S:    Maintained
  F:    drivers/video/smscufx.c
  
  SN-IA64 (Itanium) SUB-PLATFORM
@@@ -6443,26 -6304,15 +6442,26 @@@ S:   Maintaine
  F:    include/linux/compiler.h
  
  SPEAR PLATFORM SUPPORT
 -M:    Viresh Kumar <viresh.kumar@st.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)
  W:    http://www.st.com/spear
  S:    Maintained
  F:    arch/arm/plat-spear/
  
 +SPEAR13XX MACHINE SUPPORT
 +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)
 +W:    http://www.st.com/spear
 +S:    Maintained
 +F:    arch/arm/mach-spear13xx/
 +
  SPEAR3XX MACHINE SUPPORT
 -M:    Viresh Kumar <viresh.kumar@st.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)
  W:    http://www.st.com/spear
@@@ -6471,8 -6321,6 +6470,8 @@@ 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>
  L:    spear-devel@list.st.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.st.com/spear
@@@ -6480,12 -6328,29 +6479,12 @@@ S:   Maintaine
  F:    arch/arm/mach-spear6xx/
  
  SPEAR CLOCK FRAMEWORK SUPPORT
 -M:    Viresh Kumar <viresh.kumar@st.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
  S:    Maintained
 -F:    arch/arm/mach-spear*/clock.c
 -F:    arch/arm/plat-spear/clock.c
 -F:    arch/arm/plat-spear/include/plat/clock.h
 -
 -SPEAR PAD MULTIPLEXING SUPPORT
 -M:    Viresh Kumar <viresh.kumar@st.com>
 -L:    spear-devel@list.st.com
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -W:    http://www.st.com/spear
 -S:    Maintained
 -F:    arch/arm/plat-spear/include/plat/padmux.h
 -F:    arch/arm/plat-spear/padmux.c
 -F:    arch/arm/mach-spear*/spear*xx.c
 -F:    arch/arm/mach-spear*/include/mach/generic.h
 -F:    arch/arm/mach-spear3xx/spear3*0.c
 -F:    arch/arm/mach-spear3xx/spear3*0_evb.c
 -F:    arch/arm/mach-spear6xx/spear600.c
 -F:    arch/arm/mach-spear6xx/spear600_evb.c
 +F:    drivers/clk/spear/
  
  SPI SUBSYSTEM
  M:    Grant Likely <grant.likely@secretlab.ca>
@@@ -6693,7 -6558,7 +6692,7 @@@ M:      Paul Mundt <lethal@linux-sh.org
  L:    linux-sh@vger.kernel.org
  W:    http://www.linux-sh.org
  Q:    http://patchwork.kernel.org/project/linux-sh/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git sh-latest
 +T:    git git://github.com/pmundt/linux-sh.git sh-latest
  S:    Supported
  F:    Documentation/sh/
  F:    arch/sh/
@@@ -6747,7 -6612,7 +6746,7 @@@ F:      include/linux/taskstats
  F:    kernel/taskstats.c
  
  TC CLASSIFIER
 -M:    Jamal Hadi Salim <hadi@cyberus.ca>
 +M:    Jamal Hadi Salim <jhs@mojatatu.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    include/linux/pkt_cls.h
@@@ -6811,30 -6676,12 +6810,30 @@@ F:   drivers/misc/tifm
  F:    drivers/mmc/host/tifm_sd.c
  F:    include/linux/tifm.h
  
 +TI LM49xxx FAMILY ASoC CODEC DRIVERS
 +M:    M R Swami Reddy <mr.swami.reddy@ti.com>
 +M:    Vishwas A Deshpande <vishwas.a.deshpande@ti.com>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    sound/soc/codecs/lm49453*
 +F:    sound/soc/codecs/isabelle*
 +
  TI TWL4030 SERIES SOC CODEC DRIVER
  M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Maintained
  F:    sound/soc/codecs/twl4030*
  
 +TI WILINK WIRELESS DRIVERS
 +M:    Luciano Coelho <coelho@ti.com>
 +L:    linux-wireless@vger.kernel.org
 +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
 +F:    drivers/net/wireless/ti/
 +F:    include/linux/wl12xx.h
 +
  TIPC NETWORK LAYER
  M:    Jon Maloy <jon.maloy@ericsson.com>
  M:    Allan Stephens <allan.stephens@windriver.com>
@@@ -6911,11 -6758,10 +6910,11 @@@ F:   include/linux/shmem_fs.
  F:    mm/shmem.c
  
  TPM DEVICE DRIVER
 -M:    Debora Velarde <debora@linux.vnet.ibm.com>
 -M:    Rajiv Andrade <srajiv@linux.vnet.ibm.com>
 +M:    Kent Yoder <key@linux.vnet.ibm.com>
 +M:    Rajiv Andrade <mail@srajiv.net>
  W:    http://tpmdd.sourceforge.net
 -M:    Marcel Selhorst <m.selhorst@sirrix.com>
 +M:    Marcel Selhorst <tpmdd@selhorst.net>
 +M:    Sirrix AG <tpmdd@sirrix.com>
  W:    http://www.sirrix.com
  L:    tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
  S:    Maintained
@@@ -7015,13 -6861,6 +7014,13 @@@ S:    Maintaine
  F:    Documentation/filesystems/ufs.txt
  F:    fs/ufs/
  
 +UHID USERSPACE HID IO DRIVER:
 +M:    David Herrmann <dh.herrmann@googlemail.com>
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +F:    drivers/hid/uhid.c
 +F:    include/linux/uhid.h
 +
  ULTRA-WIDEBAND (UWB) SUBSYSTEM:
  L:    linux-usb@vger.kernel.org
  S:    Orphan
@@@ -7050,14 -6889,6 +7049,14 @@@ F:    Documentation/cdrom
  F:    drivers/cdrom/cdrom.c
  F:    include/linux/cdrom.h
  
 +UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
 +M:    Vinayak Holikatti <vinholikatti@gmail.com>
 +M:    Santosh Y <santoshsy@gmail.com>
 +L:    linux-scsi@vger.kernel.org
 +S:    Supported
 +F:    Documentation/scsi/ufs.txt
 +F:    drivers/scsi/ufs/
 +
  UNSORTED BLOCK IMAGES (UBI)
  M:    Artem Bityutskiy <dedekind1@gmail.com>
  W:    http://www.linux-mtd.infradead.org/
@@@ -7204,14 -7035,6 +7203,14 @@@ W:    http://pegasus2.sourceforge.net
  S:    Maintained
  F:    drivers/net/usb/pegasus.*
  
 +USB PHY LAYER
 +M:    Felipe Balbi <balbi@ti.com>
 +L:    linux-usb@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
 +S:    Maintained
 +F:    drivers/usb/phy/
 +F:    drivers/usb/otg/
 +
  USB PRINTER DRIVER (usblp)
  M:    Pete Zaitcev <zaitcev@redhat.com>
  L:    linux-usb@vger.kernel.org
@@@ -7282,9 -7105,9 +7281,9 @@@ S:      Supporte
  F:    drivers/usb/serial/whiteheat*
  
  USB SMSC95XX ETHERNET DRIVER
 -M:    Steve Glendinning <steve.glendinning@smsc.com>
 +M:    Steve Glendinning <steve.glendinning@shawell.net>
  L:    netdev@vger.kernel.org
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/usb/smsc95xx.*
  
  USB SN9C1xx DRIVER
@@@ -7391,11 -7214,11 +7390,11 @@@ F:   Documentation/DocBook/uio-howto.tmp
  F:    drivers/uio/
  F:    include/linux/uio*.h
  
 -UTIL-LINUX-NG PACKAGE
 +UTIL-LINUX PACKAGE
  M:    Karel Zak <kzak@redhat.com>
 -L:    util-linux-ng@vger.kernel.org
 -W:    http://kernel.org/~kzak/util-linux-ng/
 -T:    git git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git
 +L:    util-linux@vger.kernel.org
 +W:    http://en.wikipedia.org/wiki/Util-linux
 +T:    git git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
  S:    Maintained
  
  UVESAFB DRIVER
@@@ -7495,18 -7318,6 +7494,18 @@@ S:    Maintaine
  F:    drivers/vlynq/vlynq.c
  F:    include/linux/vlynq.h
  
 +VME SUBSYSTEM
 +M:    Martyn Welch <martyn.welch@ge.com>
 +M:    Manohar Vanga <manohar.vanga@gmail.com>
 +M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +L:    devel@driverdev.osuosl.org
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
 +F:    Documentation/vme_api.txt
 +F:    drivers/staging/vme/
 +F:    drivers/vme/
 +F:    include/linux/vme*
 +
  VMWARE VMXNET3 ETHERNET DRIVER
  M:    Shreyas Bhatewara <sbhatewara@vmware.com>
  M:    "VMware, Inc." <pv-drivers@vmware.com>
@@@ -7627,6 -7438,23 +7626,6 @@@ M:     Miloslav Trmac <mitr@volny.cz
  S:    Maintained
  F:    drivers/input/misc/wistron_btns.c
  
 -WL1251 WIRELESS DRIVER
 -M:    Luciano Coelho <coelho@ti.com>
 -L:    linux-wireless@vger.kernel.org
 -W:    http://wireless.kernel.org/en/users/Drivers/wl1251
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 -S:    Maintained
 -F:    drivers/net/wireless/wl1251/*
 -
 -WL1271 WIRELESS DRIVER
 -M:    Luciano Coelho <coelho@ti.com>
 -L:    linux-wireless@vger.kernel.org
 -W:    http://wireless.kernel.org/en/users/Drivers/wl12xx
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
 -S:    Maintained
 -F:    drivers/net/wireless/wl12xx/
 -F:    include/linux/wl12xx.h
 -
  WL3501 WIRELESS PCMCIA CARD DRIVER
  M:    Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
  L:    linux-wireless@vger.kernel.org
@@@ -7653,9 -7481,7 +7652,9 @@@ W:      http://opensource.wolfsonmicro.com/c
  S:    Supported
  F:    Documentation/hwmon/wm83??
  F:    arch/arm/mach-s3c64xx/mach-crag6410*
 +F:    drivers/clk/clk-wm83*.c
  F:    drivers/leds/leds-wm83*.c
 +F:    drivers/gpio/gpio-*wm*.c
  F:    drivers/hwmon/wm83??-hwmon.c
  F:    drivers/input/misc/wm831x-on.c
  F:    drivers/input/touchscreen/wm831x-ts.c
@@@ -7750,7 -7576,7 +7749,7 @@@ XFS FILESYSTE
  P:    Silicon Graphics Inc
  M:    Ben Myers <bpm@sgi.com>
  M:    Alex Elder <elder@kernel.org>
 -M:    xfs-masters@oss.sgi.com
 +M:    xfs@oss.sgi.com
  L:    xfs@oss.sgi.com
  W:    http://oss.sgi.com/projects/xfs
  T:    git git://oss.sgi.com/xfs/xfs.git

diff --combined drivers/i2c/i2c-core.c
index 26488aa893d5e5dc62ac2d01c332dd2d4ca9d2a1,ccc6445979c4ad23a54a54e05292b1003233a9c8..2efa56c5ff2c32d10ff3018def5bc077b8492e4e
--- 1/drivers/i2c/i2c-core.c
--- 2/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@@ -772,23 -772,6 +772,23 @@@ struct device_type i2c_adapter_type = 
  };
  EXPORT_SYMBOL_GPL(i2c_adapter_type);
  
 +/**
 + * i2c_verify_adapter - return parameter as i2c_adapter or NULL
 + * @dev: device, probably from some driver model iterator
 + *
 + * When traversing the driver model tree, perhaps using driver model
 + * iterators like @device_for_each_child(), you can't assume very much
 + * about the nodes you find.  Use this function to avoid oopses caused
 + * by wrongly treating some non-I2C device as an i2c_adapter.
 + */
 +struct i2c_adapter *i2c_verify_adapter(struct device *dev)
 +{
 +      return (dev->type == &i2c_adapter_type)
 +                      ? to_i2c_adapter(dev)
 +                      : NULL;
 +}
 +EXPORT_SYMBOL(i2c_verify_adapter);
 +
  #ifdef CONFIG_I2C_COMPAT
  static struct class_compat *i2c_adapter_compat_class;
  #endif
@@@ -1311,6 -1294,37 +1311,37 @@@ module_exit(i2c_exit)
   * ----------------------------------------------------
   */
  
+ /**
+  * __i2c_transfer - unlocked flavor of i2c_transfer
+  * @adap: Handle to I2C bus
+  * @msgs: One or more messages to execute before STOP is issued to
+  *    terminate the operation; each message begins with a START.
+  * @num: Number of messages to be executed.
+  *
+  * Returns negative errno, else the number of messages executed.
+  *
+  * Adapter lock must be held when calling this function. No debug logging
+  * takes place. adap->algo->master_xfer existence isn't checked.
+  */
+ int __i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
+ {
+       unsigned long orig_jiffies;
+       int ret, try;
+ 
+       /* Retry automatically on arbitration loss */
+       orig_jiffies = jiffies;
+       for (ret = 0, try = 0; try <= adap->retries; try++) {
+               ret = adap->algo->master_xfer(adap, msgs, num);
+               if (ret != -EAGAIN)
+                       break;
+               if (time_after(jiffies, orig_jiffies + adap->timeout))
+                       break;
+       }
+ 
+       return ret;
+ }
+ EXPORT_SYMBOL(__i2c_transfer);
+ 
  /**
   * i2c_transfer - execute a single or combined I2C message
   * @adap: Handle to I2C bus
@@@ -1325,8 -1339,7 +1356,7 @@@
   */
  int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
  {
-       unsigned long orig_jiffies;
-       int ret, try;
+       int ret;
  
        /* REVISIT the fault reporting model here is weak:
         *
@@@ -1364,15 -1377,7 +1394,7 @@@
                        i2c_lock_adapter(adap);
                }
  
-               /* Retry automatically on arbitration loss */
-               orig_jiffies = jiffies;
-               for (ret = 0, try = 0; try <= adap->retries; try++) {
-                       ret = adap->algo->master_xfer(adap, msgs, num);
-                       if (ret != -EAGAIN)
-                               break;
-                       if (time_after(jiffies, orig_jiffies + adap->timeout))
-                               break;
-               }
+               ret = __i2c_transfer(adap, msgs, num);
                i2c_unlock_adapter(adap);
  
                return ret;
@@@ -2122,7 -2127,7 +2144,7 @@@ s32 i2c_smbus_xfer(struct i2c_adapter *
        int try;
        s32 res;
  
 -      flags &= I2C_M_TEN | I2C_CLIENT_PEC;
 +      flags &= I2C_M_TEN | I2C_CLIENT_PEC | I2C_CLIENT_SCCB;
  
        if (adapter->algo->smbus_xfer) {
                i2c_lock_adapter(adapter);
@@@ -2140,17 -2145,11 +2162,17 @@@
                                break;
                }
                i2c_unlock_adapter(adapter);
 -      } else
 -              res = i2c_smbus_xfer_emulated(adapter, addr, flags, read_write,
 -                                            command, protocol, data);
  
 -      return res;
 +              if (res != -EOPNOTSUPP || !adapter->algo->master_xfer)
 +                      return res;
 +              /*
 +               * Fall back to i2c_smbus_xfer_emulated if the adapter doesn't
 +               * implement native support for the SMBus operation.
 +               */
 +      }
 +
 +      return i2c_smbus_xfer_emulated(adapter, addr, flags, read_write,
 +                                     command, protocol, data);
  }
  EXPORT_SYMBOL(i2c_smbus_xfer);
  

diff --combined drivers/media/video/v4l2-dev.c
index 0cbada18f6f57376d980d34345335279499fec03,d13c47fc7202681a1fa0f7017c010ecfc81eb9e7..af70f931727c3803ac4739ff101342b3882cdd4d
--- 1/drivers/media/video/v4l2-dev.c
--- 2/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/video/v4l2-dev.c
@@@ -46,6 -46,29 +46,29 @@@ static ssize_t show_index(struct devic
        return sprintf(buf, "%i\n", vdev->index);
  }
  
+ static ssize_t show_debug(struct device *cd,
+                        struct device_attribute *attr, char *buf)
+ {
+       struct video_device *vdev = to_video_device(cd);
+ 
+       return sprintf(buf, "%i\n", vdev->debug);
+ }
+ 
+ static ssize_t set_debug(struct device *cd, struct device_attribute *attr,
+                  const char *buf, size_t len)
+ {
+       struct video_device *vdev = to_video_device(cd);
+       int res = 0;
+       u16 value;
+ 
+       res = kstrtou16(buf, 0, &value);
+       if (res)
+               return res;
+ 
+       vdev->debug = value;
+       return len;
+ }
+ 
  static ssize_t show_name(struct device *cd,
                         struct device_attribute *attr, char *buf)
  {
@@@ -56,6 -79,7 +79,7 @@@
  
  static struct device_attribute video_device_attrs[] = {
        __ATTR(name, S_IRUGO, show_name, NULL),
+       __ATTR(debug, 0644, show_debug, set_debug),
        __ATTR(index, S_IRUGO, show_index, NULL),
        __ATTR_NULL
  };
@@@ -281,6 -305,9 +305,9 @@@ static ssize_t v4l2_read(struct file *f
                ret = vdev->fops->read(filp, buf, sz, off);
        if (test_bit(V4L2_FL_LOCK_ALL_FOPS, &vdev->flags))
                mutex_unlock(vdev->lock);
+       if (vdev->debug)
+               printk(KERN_DEBUG "%s: read: %zd (%d)\n",
+                       video_device_node_name(vdev), sz, ret);
        return ret;
  }
  
@@@ -299,6 -326,9 +326,9 @@@ static ssize_t v4l2_write(struct file *
                ret = vdev->fops->write(filp, buf, sz, off);
        if (test_bit(V4L2_FL_LOCK_ALL_FOPS, &vdev->flags))
                mutex_unlock(vdev->lock);
+       if (vdev->debug)
+               printk(KERN_DEBUG "%s: write: %zd (%d)\n",
+                       video_device_node_name(vdev), sz, ret);
        return ret;
  }
  
@@@ -315,6 -345,9 +345,9 @@@ static unsigned int v4l2_poll(struct fi
                ret = vdev->fops->poll(filp, poll);
        if (test_bit(V4L2_FL_LOCK_ALL_FOPS, &vdev->flags))
                mutex_unlock(vdev->lock);
+       if (vdev->debug)
+               printk(KERN_DEBUG "%s: poll: %08x\n",
+                       video_device_node_name(vdev), ret);
        return ret;
  }
  
@@@ -324,20 -357,14 +357,14 @@@ static long v4l2_ioctl(struct file *fil
        int ret = -ENODEV;
  
        if (vdev->fops->unlocked_ioctl) {
-               bool locked = false;
- 
-               if (vdev->lock) {
-                       /* always lock unless the cmd is marked as "don't use lock" */
-                       locked = !v4l2_is_known_ioctl(cmd) ||
-                                !test_bit(_IOC_NR(cmd), vdev->disable_locking);
+               struct mutex *lock = v4l2_ioctl_get_lock(vdev, cmd);
  
-                       if (locked && mutex_lock_interruptible(vdev->lock))
-                               return -ERESTARTSYS;
-               }
+               if (lock && mutex_lock_interruptible(lock))
+                       return -ERESTARTSYS;
                if (video_is_registered(vdev))
                        ret = vdev->fops->unlocked_ioctl(filp, cmd, arg);
-               if (locked)
-                       mutex_unlock(vdev->lock);
+               if (lock)
+                       mutex_unlock(lock);
        } else if (vdev->fops->ioctl) {
                /* This code path is a replacement for the BKL. It is a major
                 * hack but it will have to do for those drivers that are not
@@@ -385,12 -412,17 +412,17 @@@ static unsigned long v4l2_get_unmapped_
                unsigned long flags)
  {
        struct video_device *vdev = video_devdata(filp);
+       int ret;
  
        if (!vdev->fops->get_unmapped_area)
                return -ENOSYS;
        if (!video_is_registered(vdev))
                return -ENODEV;
-       return vdev->fops->get_unmapped_area(filp, addr, len, pgoff, flags);
+       ret = vdev->fops->get_unmapped_area(filp, addr, len, pgoff, flags);
+       if (vdev->debug)
+               printk(KERN_DEBUG "%s: get_unmapped_area (%d)\n",
+                       video_device_node_name(vdev), ret);
+       return ret;
  }
  #endif
  
@@@ -408,6 -440,9 +440,9 @@@ static int v4l2_mmap(struct file *filp
                ret = vdev->fops->mmap(filp, vm);
        if (test_bit(V4L2_FL_LOCK_ALL_FOPS, &vdev->flags))
                mutex_unlock(vdev->lock);
+       if (vdev->debug)
+               printk(KERN_DEBUG "%s: mmap (%d)\n",
+                       video_device_node_name(vdev), ret);
        return ret;
  }
  
@@@ -446,6 -481,9 +481,9 @@@ err
        /* decrease the refcount in case of an error */
        if (ret)
                video_put(vdev);
+       if (vdev->debug)
+               printk(KERN_DEBUG "%s: open (%d)\n",
+                       video_device_node_name(vdev), ret);
        return ret;
  }
  
@@@ -465,6 -503,9 +503,9 @@@ static int v4l2_release(struct inode *i
        /* decrease the refcount unconditionally since the release()
           return value is ignored. */
        video_put(vdev);
+       if (vdev->debug)
+               printk(KERN_DEBUG "%s: release\n",
+                       video_device_node_name(vdev));
        return ret;
  }
  
@@@ -681,7 -722,6 +722,7 @@@ static void determine_valid_ioctls(stru
        SET_VALID_IOCTL(ops, VIDIOC_G_DV_TIMINGS, vidioc_g_dv_timings);
        SET_VALID_IOCTL(ops, VIDIOC_ENUM_DV_TIMINGS, vidioc_enum_dv_timings);
        SET_VALID_IOCTL(ops, VIDIOC_QUERY_DV_TIMINGS, vidioc_query_dv_timings);
 +      SET_VALID_IOCTL(ops, VIDIOC_DV_TIMINGS_CAP, vidioc_dv_timings_cap);
        /* yes, really vidioc_subscribe_event */
        SET_VALID_IOCTL(ops, VIDIOC_DQEVENT, vidioc_subscribe_event);
        SET_VALID_IOCTL(ops, VIDIOC_SUBSCRIBE_EVENT, vidioc_subscribe_event);

diff --combined include/linux/Kbuild
index 9547daddf8130f7db081edb28dad839c7c652268,ef4cc9429c3a0c556f7d37cb5632e04d527f5bfd..d9a7544748785d020ba77f74392fb1275fbe02fd
--- 1/include/linux/Kbuild
--- 2/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@@ -167,6 -167,7 +167,6 @@@ header-y += if_arp.
  header-y += if_bonding.h
  header-y += if_bridge.h
  header-y += if_cablemodem.h
 -header-y += if_ec.h
  header-y += if_eql.h
  header-y += if_ether.h
  header-y += if_fc.h
@@@ -183,7 -184,9 +183,7 @@@ header-y += if_ppp.
  header-y += if_pppol2tp.h
  header-y += if_pppox.h
  header-y += if_slip.h
 -header-y += if_strip.h
  header-y += if_team.h
 -header-y += if_tr.h
  header-y += if_tun.h
  header-y += if_tunnel.h
  header-y += if_vlan.h
@@@ -224,8 -227,6 +224,8 @@@ header-y += kd.
  header-y += kdev_t.h
  header-y += kernel.h
  header-y += kernelcapi.h
 +header-y += kernel-page-flags.h
 +header-y += kexec.h
  header-y += keyboard.h
  header-y += keyctl.h
  header-y += l2tp.h
@@@ -239,7 -240,6 +239,7 @@@ header-y += map_to_7segment.
  header-y += matroxfb.h
  header-y += mdio.h
  header-y += media.h
 +header-y += mei.h
  header-y += mempolicy.h
  header-y += meye.h
  header-y += mii.h
@@@ -271,7 -271,6 +271,7 @@@ header-y += netfilter_ipv4.
  header-y += netfilter_ipv6.h
  header-y += netlink.h
  header-y += netrom.h
 +header-y += nfc.h
  header-y += nfs.h
  header-y += nfs2.h
  header-y += nfs3.h
@@@ -333,7 -332,6 +333,7 @@@ header-y += scc.
  header-y += sched.h
  header-y += screen_info.h
  header-y += sdla.h
 +header-y += seccomp.h
  header-y += securebits.h
  header-y += selinux_netlink.h
  header-y += sem.h
@@@ -375,7 -373,6 +375,7 @@@ header-y += tty.
  header-y += types.h
  header-y += udf_fs_i.h
  header-y += udp.h
 +header-y += uhid.h
  header-y += uinput.h
  header-y += uio.h
  header-y += ultrasound.h
@@@ -384,8 -381,8 +384,9 @@@ header-y += unistd.
  header-y += usbdevice_fs.h
  header-y += utime.h
  header-y += utsname.h
 +header-y += uuid.h
  header-y += uvcvideo.h
+ header-y += v4l2-common.h
  header-y += v4l2-dv-timings.h
  header-y += v4l2-mediabus.h
  header-y += v4l2-subdev.h

diff --combined include/linux/i2c.h
index 1d0fe4877b1fa0fdd4c9e2c36a4f154874de8cc1,a121c012309a62c1be284fd056dcf19fde2b3c89..5970266930a26f0517208b03336646232067dc1a
--- 1/include/linux/i2c.h
--- 2/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@@ -68,6 -68,9 +68,9 @@@ extern int i2c_master_recv(const struc
   */
  extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
                        int num);
+ /* Unlocked flavor */
+ extern int __i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
+                         int num);
  
  /* This is the very generalized SMBus access routine. You probably do not
     want to use this, though; one of the functions below may be much easier,
@@@ -232,7 -235,6 +235,7 @@@ struct i2c_client 
  #define to_i2c_client(d) container_of(d, struct i2c_client, dev)
  
  extern struct i2c_client *i2c_verify_client(struct device *dev);
 +extern struct i2c_adapter *i2c_verify_adapter(struct device *dev);
  
  static inline struct i2c_client *kobj_to_i2c_client(struct kobject *kobj)
  {
@@@ -425,8 -427,6 +428,8 @@@ void i2c_unlock_adapter(struct i2c_adap
  #define I2C_CLIENT_TEN        0x10            /* we have a ten bit chip address */
                                        /* Must equal I2C_M_TEN below */
  #define I2C_CLIENT_WAKE       0x80            /* for board_info; true iff can wake */
 +#define I2C_CLIENT_SCCB       0x9000          /* Use Omnivision SCCB protocol */
 +                                      /* Must match I2C_M_STOP|IGNORE_NAK */
  
  /* i2c adapter classes (bitmask) */
  #define I2C_CLASS_HWMON               (1<<0)  /* lm_sensors, ... */
@@@ -543,8 -543,7 +546,8 @@@ struct i2c_msg 
        __u16 flags;
  #define I2C_M_TEN             0x0010  /* this is a ten bit chip address */
  #define I2C_M_RD              0x0001  /* read data, from slave to master */
 -#define I2C_M_NOSTART         0x4000  /* if I2C_FUNC_PROTOCOL_MANGLING */
 +#define I2C_M_STOP            0x8000  /* if I2C_FUNC_PROTOCOL_MANGLING */
 +#define I2C_M_NOSTART         0x4000  /* if I2C_FUNC_NOSTART */
  #define I2C_M_REV_DIR_ADDR    0x2000  /* if I2C_FUNC_PROTOCOL_MANGLING */
  #define I2C_M_IGNORE_NAK      0x1000  /* if I2C_FUNC_PROTOCOL_MANGLING */
  #define I2C_M_NO_RD_ACK               0x0800  /* if I2C_FUNC_PROTOCOL_MANGLING */
@@@ -557,9 -556,8 +560,9 @@@
  
  #define I2C_FUNC_I2C                  0x00000001
  #define I2C_FUNC_10BIT_ADDR           0x00000002
 -#define I2C_FUNC_PROTOCOL_MANGLING    0x00000004 /* I2C_M_NOSTART etc. */
 +#define I2C_FUNC_PROTOCOL_MANGLING    0x00000004 /* I2C_M_IGNORE_NAK etc. */
  #define I2C_FUNC_SMBUS_PEC            0x00000008
 +#define I2C_FUNC_NOSTART              0x00000010 /* I2C_M_NOSTART */
  #define I2C_FUNC_SMBUS_BLOCK_PROC_CALL        0x00008000 /* SMBus 2.0 */
  #define I2C_FUNC_SMBUS_QUICK          0x00010000
  #define I2C_FUNC_SMBUS_READ_BYTE      0x00020000