Merge branch '7.0.38-k2' of git://66.93.40.222/srv/git/netdev-2.6

diff --combined MAINTAINERS
index 6d3c401ccdb6cb14e8b5c5248b7a99f1743cd109,64242673c9b09e56c0401c35f6988b0b04d814fc..b6dc07f1d63d92d59109be18e7cde49bfd19bed1
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1395,6 -1395,8 +1395,8 @@@ P:      Jesse Brandebur
  M:    jesse.brandeburg@intel.com
  P:    Jeff Kirsher
  M:    jeffrey.t.kirsher@intel.com
+ P:    Auke Kok
+ M:    auke-jan.h.kok@intel.com
  W:    http://sourceforge.net/projects/e1000/
  S:    Supported
  
@@@ -1407,6 -1409,8 +1409,8 @@@ P:      Jesse Brandebur
  M:    jesse.brandeburg@intel.com
  P:    Jeff Kirsher
  M:    jeffrey.t.kirsher@intel.com
+ P:    Auke Kok
+ M:    auke-jan.h.kok@intel.com
  W:    http://sourceforge.net/projects/e1000/
  S:    Supported
  
@@@ -1419,6 -1423,8 +1423,8 @@@ P:      John Roncia
  M:    john.ronciak@intel.com
  P:    Jesse Brandeburg
  M:    jesse.brandeburg@intel.com
+ P:    Auke Kok
+ M:    auke-jan.h.kok@intel.com
  W:    http://sourceforge.net/projects/e1000/
  S:    Supported
  
@@@ -3058,6 -3064,13 +3064,6 @@@ M:     khali@linux-fr.or
  L:    lm-sensors@lm-sensors.org
  S:    Odd Fixes
  
 -WAN ROUTER & SANGOMA WANPIPE DRIVERS & API (X.25, FRAME RELAY, PPP, CISCO HDLC)
 -P:    Nenad Corbic
 -M:    ncorbic@sangoma.com
 -M:    dm@sangoma.com
 -W:    http://www.sangoma.com
 -S:    Supported
 -
  WATCHDOG DEVICE DRIVERS
  P:    Wim Van Sebroeck
  M:    wim@iguana.be