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

diff --combined MAINTAINERS
index d65048a81ecdc186c7d8dad92296da85cb7a17e6,a01884407fe45065b99891c82909dca5b5094564..5f74bce18546900d93a0cbc409f9ed4685e83898
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -616,7 -616,7 +616,7 @@@ M: mkpetch@internode.on.ne
  S:    Maintained
  
  ARM/TOSA MACHINE SUPPORT
- P:    Dmitry Baryshkov
+ P:    Dmitry Eremin-Solenikov
  M:    dbaryshkov@gmail.com
  P:    Dirk Opfer
  M:    dirk@opfer-online.de
@@@ -1024,16 -1024,17 +1024,17 @@@ S:   Maintaine
  BTTV VIDEO4LINUX DRIVER
  P:    Mauro Carvalho Chehab
  M:    mchehab@infradead.org
- M:    v4l-dvb-maintainer@linuxtv.org
+ L:    linux-media@vger.kernel.org
  L:    video4linux-list@redhat.com
  W:    http://linuxtv.org
- T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER
  P:    Jonathan Corbet
  M:    corbet@lwn.net
- L:    video4linux-list@redhat.com
+ L:    linux-media@vger.kernel.org
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  CALGARY x86-64 IOMMU
@@@ -1092,11 -1093,8 +1093,8 @@@ S:     Maintaine
  
  CHECKPATCH
  P:    Andy Whitcroft
- M:    apw@shadowen.org
- P:    Randy Dunlap
- M:    rdunlap@xenotime.net
- P:    Joel Schopp
- M:    jschopp@austin.ibm.com
+ M:    apw@canonical.com
+ L:    linux-kernel@vger.kernel.org
  S:    Supported
  
  CISCO 10G ETHERNET DRIVER
@@@ -1264,7 -1262,8 +1262,8 @@@ P:      Hans Verkuil, Andy Wall
  M:    hverkuil@xs4all.nl, awalls@radix.net
  L:    ivtv-devel@ivtvdriver.org
  L:    ivtv-users@ivtvdriver.org
- L:    video4linux-list@redhat.com
+ L:    linux-media@vger.kernel.org
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  W:    http://linuxtv.org
  S:    Maintained
  
@@@ -1490,10 -1489,10 +1489,10 @@@ S:   Maintaine
  
  DVB SUBSYSTEM AND DRIVERS
  P:    LinuxTV.org Project
- M:    v4l-dvb-maintainer@linuxtv.org
+ M:    linux-media@vger.kernel.org
  L:    linux-dvb@linuxtv.org (subscription required)
  W:    http://linuxtv.org/
- T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  DZ DECSTATION DZ11 SERIAL DRIVER
@@@ -1755,6 -1754,13 +1754,13 @@@ L:    linuxppc-dev@ozlabs.or
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
  
+ FREESCALE IMX / MXC FRAMEBUFFER DRIVER
+ P:    Sascha Hauer
+ M:    kernel@pengutronix.de
+ L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+ L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+ S:    Maintained
+ 
  FREESCALE SOC FS_ENET DRIVER
  P:    Pantelis Antoniou
  M:    pantelis.antoniou@gmail.com
@@@ -1878,32 -1884,37 +1884,37 @@@ S:   Maintaine
  GSPCA FINEPIX SUBDRIVER
  P:    Frank Zago
  M:    frank@zago.net
- L:    video4linux-list@redhat.com
+ L:    linux-media@vger.kernel.org
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  GSPCA M5602 SUBDRIVER
  P:    Erik Andren
  M:    erik.andren@gmail.com
- L:    video4linux-list@redhat.com
+ L:    linux-media@vger.kernel.org
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  GSPCA PAC207 SONIXB SUBDRIVER
  P:    Hans de Goede
  M:    hdegoede@redhat.com
- L:    video4linux-list@redhat.com
+ L:    linux-media@vger.kernel.org
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  GSPCA T613 SUBDRIVER
  P:    Leandro Costantino
  M:    lcostantino@gmail.com
- L:    video4linux-list@redhat.com
+ L:    linux-media@vger.kernel.org
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  GSPCA USB WEBCAM DRIVER
  P:    Jean-Francois Moine
  M:    moinejf@free.fr
  W:    http://moinejf.free.fr
- L:    video4linux-list@redhat.com
+ L:    linux-media@vger.kernel.org
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  HARDWARE MONITORING
@@@ -2042,6 -2053,12 +2053,12 @@@ M:    mikulas@artax.karlin.mff.cuni.c
  W:    http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/hpfs/index-e.cgi
  S:    Maintained
  
+ HSO   3G Modem Driver (hso.c)
+ P:    Denis Joseph Barrow
+ M:    d.barow@option.com
+ W:    http://www.pharscape.org
+ S:    Maintained
+ 
  HTCPEN TOUCHSCREEN DRIVER
  P:    Pau Oliva Fora
  M:    pof@eslack.org
@@@ -2139,11 -2156,6 +2156,6 @@@ M:     Gadi Oxman <gadio@netvision.net.il
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
- IDE-SCSI DRIVER
- L:    linux-ide@vger.kernel.org
- L:    linux-scsi@vger.kernel.org
- S:    Orphan
- 
  IDLE-I7300
  P:    Andy Henroid
  M:    andrew.d.henroid@intel.com
@@@ -2300,6 -2312,14 +2312,14 @@@ W:    http://lists.sourceforge.net/mailman
  W:    http://ipw2200.sourceforge.net
  S:    Supported
  
+ INTEL WIRELESS WIMAX CONNECTION 2400
+ P:    Inaky Perez-Gonzalez
+ M:    inaky.perez-gonzalez@intel.com
+ M:    linux-wimax@intel.com
+ L:    wimax@linuxwimax.org
+ S:    Supported
+ W:    http://linuxwimax.org
+ 
  INTEL WIRELESS WIFI LINK (iwlwifi)
  P:    Zhu Yi
  M:    yi.zhu@intel.com
@@@ -2424,7 -2444,8 +2444,8 @@@ P:      Hans Verkui
  M:    hverkuil@xs4all.nl
  L:    ivtv-devel@ivtvdriver.org
  L:    ivtv-users@ivtvdriver.org
- L:    video4linux-list@redhat.com
+ L:    linux-media@vger.kernel.org
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  W:    http://www.ivtvdriver.org
  S:    Maintained
  
@@@ -2534,8 -2555,6 +2555,6 @@@ W:      http://kvm.qumranet.co
  S:    Supported
  
  KERNEL VIRTUAL MACHINE For Itanium (KVM/IA64)
- P:    Anthony Xu
- M:    anthony.xu@intel.com
  P:    Xiantao Zhang
  M:    xiantao.zhang@intel.com
  L:    kvm-ia64@vger.kernel.org
@@@ -2628,13 -2647,13 +2647,13 @@@ W:   http://www.hansenpartnership.com/voy
  S:    Maintained
  
  LINUX FOR POWERPC (32-BIT AND 64-BIT)
- P:    Paul Mackerras
- M:    paulus@samba.org
  P:    Benjamin Herrenschmidt
  M:    benh@kernel.crashing.org
+ P:    Paul Mackerras
+ M:    paulus@samba.org
  W:    http://www.penguinppc.org/
  L:    linuxppc-dev@ozlabs.org
- T:    git kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc.git
+ T:    git kernel.org:/pub/scm/linux/kernel/git/benh/powerpc.git
  S:    Supported
  
  LINUX FOR POWER MACINTOSH
@@@ -2979,6 -2998,7 +2998,7 @@@ MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CO
  P:    Felipe Balbi
  M:    felipe.balbi@nokia.com
  L:    linux-usb@vger.kernel.org
+ T:    git gitorious.org:/musb/mainline.git
  S:    Maintained
  
  MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
@@@ -3185,7 -3205,8 +3205,8 @@@ S:      Maintaine
  OMNIVISION OV7670 SENSOR DRIVER
  P:    Jonathan Corbet
  M:    corbet@lwn.net
- L:    video4linux-list@redhat.com
+ L:    linux-media@vger.kernel.org
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  ONENAND FLASH DRIVER
@@@ -3467,8 -3488,9 +3488,9 @@@ PVRUSB2 VIDEO4LINUX DRIVE
  P:    Mike Isely
  M:    isely@pobox.com
  L:    pvrusb2@isely.net       (subscribers-only)
- L:    video4linux-list@redhat.com
+ L:    linux-media@vger.kernel.org
  W:    http://www.isely.net/pvrusb2/
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  PXA2xx/PXA3xx SUPPORT
@@@ -3688,6 -3710,8 +3710,8 @@@ S:      Supporte
  SAA7146 VIDEO4LINUX-2 DRIVER
  P:    Michael Hunold
  M:    michael@mihu.de
+ L:    linux-media@vger.kernel.org
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  W:    http://www.mihu.de/linux/saa7146
  S:    Maintained
  
@@@ -3951,7 -3975,8 +3975,8 @@@ S:      Maintaine
  SOC-CAMERA V4L2 SUBSYSTEM
  P:    Guennadi Liakhovetski
  M:    g.liakhovetski@gmx.de
- L:    video4linux-list@redhat.com
+ L:    linux-media@vger.kernel.org
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  SOEKRIS NET48XX LED SUPPORT
@@@ -4009,10 -4034,12 +4034,12 @@@ L:   alsa-devel@alsa-project.org (subscri
  W:    http://alsa-project.org/main/index.php/ASoC
  S:    Supported
  
- SPARC (sparc32)
- P:    William L. Irwin
- M:    wli@holomorphy.com
+ SPARC + UltraSPARC (sparc/sparc64)
+ P:    David S. Miller
+ M:    davem@davemloft.net
  L:    sparclinux@vger.kernel.org
+ T:    git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
+ T:    git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
  S:    Maintained
  
  SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
@@@ -4224,9 -4251,10 +4251,10 @@@ L:    tpmdd-devel@lists.sourceforge.net (m
  S:    Maintained
  
  TRIVIAL PATCHES
- P:    Jesper Juhl
+ P:    Jiri Kosina
  M:    trivial@kernel.org
  L:    linux-kernel@vger.kernel.org
+ T:    git kernel.org:/pub/scm/linux/kernel/git/jikos/trivial.git
  S:    Maintained
  
  TTY LAYER
@@@ -4296,13 -4324,6 +4324,6 @@@ M:     dushistov@mail.r
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
- UltraSPARC (sparc64)
- P:    David S. Miller
- M:    davem@davemloft.net
- L:    sparclinux@vger.kernel.org
- T:    git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
- S:    Maintained
- 
  ULTRA-WIDEBAND (UWB) SUBSYSTEM:
  P:    David Vrabel
  M:    david.vrabel@csr.com
@@@ -4374,7 -4395,8 +4395,8 @@@ USB ET61X[12]51 DRIVE
  P:    Luca Risolia
  M:    luca.risolia@studio.unibo.it
  L:    linux-usb@vger.kernel.org
- L:    video4linux-list@redhat.com
+ L:    linux-media@vger.kernel.org
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  W:    http://www.linux-projects.org
  S:    Maintained
  
@@@ -4523,7 -4545,8 +4545,8 @@@ USB SN9C1xx DRIVE
  P:    Luca Risolia
  M:    luca.risolia@studio.unibo.it
  L:    linux-usb@vger.kernel.org
- L:    video4linux-list@redhat.com
+ L:    linux-media@vger.kernel.org
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  W:    http://www.linux-projects.org
  S:    Maintained
  
@@@ -4552,7 -4575,8 +4575,8 @@@ USB VIDEO CLAS
  P:    Laurent Pinchart
  M:    laurent.pinchart@skynet.be
  L:    linux-uvc-devel@lists.berlios.de (subscribers-only)
- L:    video4linux-list@redhat.com
+ L:    linux-media@vger.kernel.org
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  W:    http://linux-uvc.berlios.de
  S:    Maintained
  
@@@ -4560,7 -4584,8 +4584,8 @@@ USB W996[87]CF DRIVE
  P:    Luca Risolia
  M:    luca.risolia@studio.unibo.it
  L:    linux-usb@vger.kernel.org
- L:    video4linux-list@redhat.com
+ L:    linux-media@vger.kernel.org
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  W:    http://www.linux-projects.org
  S:    Maintained
  
@@@ -4574,7 -4599,8 +4599,8 @@@ USB ZC0301 DRIVE
  P:    Luca Risolia
  M:    luca.risolia@studio.unibo.it
  L:    linux-usb@vger.kernel.org
- L:    video4linux-list@redhat.com
+ L:    linux-media@vger.kernel.org
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  W:    http://www.linux-projects.org
  S:    Maintained
  
@@@ -4589,7 -4615,8 +4615,8 @@@ USB ZR364XX DRIVE
  P:    Antoine Jacquet
  M:    royale@zerezo.com
  L:    linux-usb@vger.kernel.org
- L:    video4linux-list@redhat.com
+ L:    linux-media@vger.kernel.org
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  W:    http://royale.zerezo.com/zr364xx/
  S:    Maintained
  
@@@ -4658,10 -4685,10 +4685,10 @@@ S:   Maintaine
  VIDEO FOR LINUX (V4L)
  P:    Mauro Carvalho Chehab
  M:    mchehab@infradead.org
- M:    v4l-dvb-maintainer@linuxtv.org
+ L:    linux-media@vger.kernel.org
  L:    video4linux-list@redhat.com
  W:    http://linuxtv.org
- T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  
  VLAN (802.1Q)
@@@ -4734,6 -4761,14 +4761,14 @@@ M:    zaga@fly.cc.fer.h
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
  
+ WIMAX STACK
+ P:    Inaky Perez-Gonzalez
+ M:    inaky.perez-gonzalez@intel.com
+ M:    linux-wimax@intel.com
+ L:    wimax@linuxwimax.org
+ S:    Supported
+ W:    http://linuxwimax.org
+ 
  WIMEDIA LLC PROTOCOL (WLP) SUBSYSTEM
  P:    David Vrabel
  M:    david.vrabel@csr.com
@@@ -4789,11 -4824,11 +4824,11 @@@ S:   Supporte
  
  XFS FILESYSTEM
  P:    Silicon Graphics Inc
 -P:    Tim Shimmin
 +P:    Bill O'Donnell
  M:    xfs-masters@oss.sgi.com
  L:    xfs@oss.sgi.com
  W:    http://oss.sgi.com/projects/xfs
 -T:    git git://oss.sgi.com:8090/xfs/xfs-2.6.git
 +T:    git://oss.sgi.com/xfs/xfs.git
  S:    Supported
  
  XILINX SYSTEMACE DRIVER