Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

diff --combined MAINTAINERS
index 72b6782f6f5c23b073f5e7c976d8197b54cf1e87,6d3c401ccdb6cb14e8b5c5248b7a99f1743cd109..20f3aea687d4ecf2e130b3cc442470772d846c07
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1778,12 -1778,12 +1778,12 @@@ S:     [email protected]
  W:     http://megaraid.lsilogic.com
  S:     Maintained
  
 -MEMORY TECHNOLOGY DEVICES
 +MEMORY TECHNOLOGY DEVICES (MTD)
  P:    David Woodhouse
  M:    [email protected]
  W:    http://www.linux-mtd.infradead.org/
  L:    [email protected]
 -T:    git kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6.git
 +T:    git git://git.infradead.org/mtd-2.6.git
  S:    Maintained
  
  MICROTEK X6 SCANNER
@@@ -3058,13 -3058,6 +3058,6 @@@ M:     [email protected]
  L:    [email protected]
  S:    Odd Fixes
  
- WAN ROUTER & SANGOMA WANPIPE DRIVERS & API (X.25, FRAME RELAY, PPP, CISCO HDLC)
- P:    Nenad Corbic
- M:    [email protected]
- M:    [email protected]
- W:    http://www.sangoma.com
- S:    Supported
- 
  WATCHDOG DEVICE DRIVERS
  P:    Wim Van Sebroeck
  M:    [email protected]