Merge branch 'master' into for-linus

diff --combined MAINTAINERS
index 969b84b,6d119c9..c92dd66
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2978,7 -2978,6 +2978,6 @@@ F:      drivers/net/ixgb
  F:    drivers/net/ixgbe/
  
  INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
- M:    Zhu Yi <yi.zhu@intel.com>
  M:    Reinette Chatre <reinette.chatre@intel.com>
  M:    Intel Linux Wireless <ilw@linux.intel.com>
  L:    linux-wireless@vger.kernel.org
@@@ -2988,7 -2987,6 +2987,6 @@@ F:      Documentation/networking/README.ipw2
  F:    drivers/net/wireless/ipw2x00/ipw2100.*
  
  INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
- M:    Zhu Yi <yi.zhu@intel.com>
  M:    Reinette Chatre <reinette.chatre@intel.com>
  M:    Intel Linux Wireless <ilw@linux.intel.com>
  L:    linux-wireless@vger.kernel.org
@@@ -3019,8 -3017,8 +3017,8 @@@ F:      drivers/net/wimax/i2400m
  F:    include/linux/wimax/i2400m.h
  
  INTEL WIRELESS WIFI LINK (iwlwifi)
- M:    Zhu Yi <yi.zhu@intel.com>
  M:    Reinette Chatre <reinette.chatre@intel.com>
+ M:    Wey-Yi Guy <wey-yi.w.guy@intel.com>
  M:    Intel Linux Wireless <ilw@linux.intel.com>
  L:    linux-wireless@vger.kernel.org
  W:    http://intellinuxwireless.org
@@@ -3030,7 -3028,6 +3028,6 @@@ F:      drivers/net/wireless/iwlwifi
  
  INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi)
  M:    Samuel Ortiz <samuel.ortiz@intel.com>
- M:    Zhu Yi <yi.zhu@intel.com>
  M:    Intel Linux Wireless <ilw@linux.intel.com>
  L:    linux-wireless@vger.kernel.org
  S:    Supported
@@@ -5572,12 -5569,6 +5569,12 @@@ F:    include/linux/tipc*.
  F:    include/net/tipc/
  F:    net/tipc/
  
 +TILE ARCHITECTURE
 +M:    Chris Metcalf <cmetcalf@tilera.com>
 +W:    http://www.tilera.com/scm/
 +S:    Supported
 +F:    arch/tile/
 +
  TLAN NETWORK DRIVER
  M:    Samuel Chessman <chessman@tux.org>
  L:    tlan-devel@lists.sourceforge.net (subscribers-only)