Merge branch 'linus' into timers/core

Reason: Get upstream changes on which new patches depend on.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --combined MAINTAINERS
index 12a1ef4,229c66b..016ee06
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -965,6 -965,12 +965,12 @@@ M:       Lennert Buytenhek <kernel@wantstofly
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
+ ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE
+ M:    Santosh Shilimkar <santosh.shilimkar@ti.com>
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ S:    Maintained
+ F:    arch/arm/mach-keystone/
+ 
  ARM/LOGICPD PXA270 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1259,7 -1265,6 +1265,6 @@@ F:      drivers/rtc/rtc-coh901331.
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
  
  ARM/Ux500 ARM ARCHITECTURE
- M:    Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
  M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
@@@ -1406,7 -1411,7 +1411,7 @@@ ATHEROS ATH6KL WIRELESS DRIVE
  M:    Kalle Valo <kvalo@qca.qualcomm.com>
  L:    linux-wireless@vger.kernel.org
  W:    http://wireless.kernel.org/en/users/Drivers/ath6kl
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath6kl.git
+ T:    git git://github.com/kvalo/ath.git
  S:    Supported
  F:    drivers/net/wireless/ath/ath6kl/
  
@@@ -1642,7 -1647,7 +1647,7 @@@ S:      Maintaine
  F:    drivers/net/hamradio/baycom*
  
  BCACHE (BLOCK LAYER CACHE)
- M:    Kent Overstreet <koverstreet@google.com>
+ M:    Kent Overstreet <kmo@daterainc.com>
  L:    linux-bcache@vger.kernel.org
  W:    http://bcache.evilpiepirate.org
  S:    Maintained:
@@@ -2107,13 -2112,6 +2112,13 @@@ M:    Russell King <linux@arm.linux.org.uk
  S:    Maintained
  F:    include/linux/clk.h
  
 +CLOCKSOURCE, CLOCKEVENT DRIVERS
 +M:    Daniel Lezcano <daniel.lezcano@linaro.org>
 +M:    Thomas Gleixner <tglx@linutronix.de>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 +S:    Supported
 +F:    drivers/clocksource
 +
  CISCO FCOE HBA DRIVER
  M:    Hiral Patel <hiralpat@cisco.com>
  M:    Suma Ramars <sramars@cisco.com>
@@@ -2878,7 -2876,7 +2883,7 @@@ 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>
+ M:    Jason Baron <jbaron@akamai.com>
  S:    Maintained
  F:    lib/dynamic_debug.c
  F:    include/linux/dynamic_debug.h
@@@ -3353,7 -3351,7 +3358,7 @@@ F:      Documentation/firmware_class
  F:    drivers/base/firmware*.c
  F:    include/linux/firmware.h
  
- FLASHSYSTEM DRIVER (IBM FlashSystem 70/80 PCI SSD Flash Card)
+ FLASH ADAPTER DRIVER (IBM Flash Adapter 900GB Full Height PCI Flash Card)
  M:    Joshua Morris <josh.h.morris@us.ibm.com>
  M:    Philip Kelleher <pjk1939@linux.vnet.ibm.com>
  S:    Maintained
@@@ -3629,11 -3627,9 +3634,9 @@@ F:     drivers/isdn/gigaset
  F:    include/uapi/linux/gigaset_dev.h
  
  GPIO SUBSYSTEM
- M:    Grant Likely <grant.likely@linaro.org>
  M:    Linus Walleij <linus.walleij@linaro.org>
  S:    Maintained
  L:    linux-gpio@vger.kernel.org
- T:    git git://git.secretlab.ca/git/linux-2.6.git
  F:    Documentation/gpio.txt
  F:    drivers/gpio/
  F:    include/linux/gpio*
@@@ -4479,8 -4475,6 +4482,6 @@@ F:      drivers/irqchip
  
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
  M:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
- M:    Grant Likely <grant.likely@linaro.org>
- T:    git git://git.secretlab.ca/git/linux-2.6.git irqdomain/next
  S:    Maintained
  F:    Documentation/IRQ-domain.txt
  F:    include/linux/irqdomain.h
@@@ -4997,7 -4991,7 +4998,7 @@@ F:      arch/powerpc/platforms/44x
  
  LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
  L:    linuxppc-dev@lists.ozlabs.org
- S:    Unmaintained
+ S:    Orphan
  F:    arch/powerpc/*/*virtex*
  F:    arch/powerpc/*/*/*virtex*
  
@@@ -5587,9 -5581,9 +5588,9 @@@ S:      Maintaine
  F:    drivers/media/tuners/mxl5007t.*
  
  MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
- M:    Andrew Gallatin <gallatin@myri.com>
+ M:    Hyong-Youb Kim <hykim@myri.com>
  L:    netdev@vger.kernel.org
- W:    http://www.myri.com/scs/download-Myri10GE.html
+ W:    https://www.myricom.com/support/downloads/myri10ge.html
  S:    Supported
  F:    drivers/net/ethernet/myricom/myri10ge/
  
@@@ -5893,7 -5887,7 +5894,7 @@@ OMAP DEVICE TREE SUPPOR
  M:    Benoît Cousson <b-cousson@ti.com>
  M:    Tony Lindgren <tony@atomide.com>
  L:    linux-omap@vger.kernel.org
- L:    devicetree-discuss@lists.ozlabs.org (moderated for non-subscribers)
+ L:    devicetree@vger.kernel.org
  S:    Maintained
  F:    arch/arm/boot/dts/*omap*
  F:    arch/arm/boot/dts/*am3*
@@@ -6057,17 -6051,28 +6058,28 @@@ F:   drivers/i2c/busses/i2c-ocores.
  OPEN FIRMWARE AND FLATTENED DEVICE TREE
  M:    Grant Likely <grant.likely@linaro.org>
  M:    Rob Herring <rob.herring@calxeda.com>
- L:    devicetree-discuss@lists.ozlabs.org (moderated for non-subscribers)
+ L:    devicetree@vger.kernel.org
  W:    http://fdt.secretlab.ca
  T:    git git://git.secretlab.ca/git/linux-2.6.git
  S:    Maintained
- F:    Documentation/devicetree
- F:    drivers/of
+ F:    drivers/of/
  F:    include/linux/of*.h
- F:    scripts/dtc
+ F:    scripts/dtc/
  K:    of_get_property
  K:    of_match_table
  
+ OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
+ M:    Rob Herring <rob.herring@calxeda.com>
+ M:    Pawel Moll <pawel.moll@arm.com>
+ M:    Mark Rutland <mark.rutland@arm.com>
+ M:    Stephen Warren <swarren@wwwdotorg.org>
+ M:    Ian Campbell <ian.campbell@citrix.com>
+ L:    devicetree@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/devicetree/
+ F:    arch/*/boot/dts/
+ F:    include/dt-bindings/
+ 
  OPENRISC ARCHITECTURE
  M:    Jonas Bonn <jonas@southpole.se>
  W:    http://openrisc.net
@@@ -6726,6 -6731,14 +6738,14 @@@ T:    git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/tuners/qt1010*
  
+ QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
+ M:    Kalle Valo <kvalo@qca.qualcomm.com>
+ L:    ath10k@lists.infradead.org
+ W:    http://wireless.kernel.org/en/users/Drivers/ath10k
+ T:    git git://github.com/kvalo/ath.git
+ S:    Supported
+ F:    drivers/net/wireless/ath/ath10k/
+ 
  QUALCOMM HEXAGON ARCHITECTURE
  M:    Richard Kuo <rkuo@codeaurora.org>
  L:    linux-hexagon@vger.kernel.org
@@@ -7130,7 -7143,7 +7150,7 @@@ S:      Maintaine
  F:    include/linux/mmc/dw_mmc.h
  F:    drivers/mmc/host/dw_mmc*
  
 -TIMEKEEPING, NTP
 +TIMEKEEPING, CLOCKSOURCE CORE, NTP
  M:    John Stultz <john.stultz@linaro.org>
  M:    Thomas Gleixner <tglx@linutronix.de>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
@@@ -7143,6 -7156,7 +7163,6 @@@ F:      include/uapi/linux/timex.
  F:    kernel/time/clocksource.c
  F:    kernel/time/time*.c
  F:    kernel/time/ntp.c
 -F:    drivers/clocksource
  
  TLG2300 VIDEO4LINUX-2 DRIVER
  M:    Huang Shijie <shijie8@gmail.com>
@@@ -7352,7 -7366,6 +7372,6 @@@ F:      drivers/net/ethernet/sfc
  
  SGI GRU DRIVER
  M:    Dimitri Sivanich <sivanich@sgi.com>
- M:    Robin Holt <holt@sgi.com>
  S:    Maintained
  F:    drivers/misc/sgi-gru/
  
@@@ -7372,7 -7385,8 +7391,8 @@@ S:      Maintained for 2.6
  F:    Documentation/sgi-visws.txt
  
  SGI XP/XPC/XPNET DRIVER
- M:    Robin Holt <holt@sgi.com>
+ M:    Cliff Whickman <cpw@sgi.com>
+ M:    Robin Holt <robinmholt@gmail.com>
  S:    Maintained
  F:    drivers/misc/sgi-xp/
  
@@@ -7752,7 -7766,6 +7772,6 @@@ F:      drivers/clk/spear
  
  SPI SUBSYSTEM
  M:    Mark Brown <broonie@kernel.org>
- M:    Grant Likely <grant.likely@linaro.org>
  L:    linux-spi@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
  Q:    http://patchwork.kernel.org/project/spi-devel-general/list/
@@@ -7818,7 -7831,7 +7837,7 @@@ F:      drivers/staging/asus_oled
  
  STAGING - COMEDI
  M:    Ian Abbott <abbotti@mev.co.uk>
- M:    Mori Hess <fmhess@users.sourceforge.net>
+ M:    H Hartley Sweeten <hsweeten@visionengravers.com>
  S:    Odd Fixes
  F:    drivers/staging/comedi/
  
@@@ -8270,7 -8283,7 +8289,7 @@@ S:      Maintaine
  F:    sound/soc/codecs/twl4030*
  
  TI WILINK WIRELESS DRIVERS
- M:    Luciano Coelho <coelho@ti.com>
+ M:    Luciano Coelho <luca@coelho.fi>
  L:    linux-wireless@vger.kernel.org
  W:    http://wireless.kernel.org/en/users/Drivers/wl12xx
  W:    http://wireless.kernel.org/en/users/Drivers/wl1251
@@@ -8656,6 -8669,11 +8675,11 @@@ T:    git git://git.alsa-project.org/alsa-
  S:    Maintained
  F:    sound/usb/midi.*
  
+ USB NETWORKING DRIVERS
+ L:    linux-usb@vger.kernel.org
+ S:    Odd Fixes
+ F:    drivers/net/usb/
+ 
  USB OHCI DRIVER
  M:    Alan Stern <stern@rowland.harvard.edu>
  L:    linux-usb@vger.kernel.org
@@@ -9294,7 -9312,7 +9318,7 @@@ S:      Maintaine
  F:    drivers/net/ethernet/xilinx/xilinx_axienet*
  
  XILINX SYSTEMACE DRIVER
- S:    Unmaintained
+ S:    Orphan
  F:    drivers/block/xsysace.c
  
  XILINX UARTLITE SERIAL DRIVER