Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

diff --combined MAINTAINERS
index 185603fad6a8c02af13b893cbd8091e6f6ff9a53,e784b358b33519a584729d99a7723de4e9497393..566eff911f91277d2aebbc5eaabaaba6d00ea30a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1905,10 -1905,10 +1905,10 @@@ W:   http://gigaset307x.sourceforge.net
  S:    Maintained
  
  HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
- P:    Robert Love
- M:    rlove@rlove.org
- M:    linux-kernel@vger.kernel.org
- W:    http://www.kernel.org/pub/linux/kernel/people/rml/hdaps/
+ P:    Frank Seidel
+ M:    frank@f-seidel.de
+ L:    lm-sensors@lm-sensors.org
+ W:    http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
  S:    Maintained
  
  GSPCA FINEPIX SUBDRIVER
@@@ -4873,8 -4873,7 +4873,8 @@@ S:      Supporte
  
  XFS FILESYSTEM
  P:    Silicon Graphics Inc
 -P:    Bill O'Donnell
 +P:    Felix Blyakher
 +M:    felixb@sgi.com
  M:    xfs-masters@oss.sgi.com
  L:    xfs@oss.sgi.com
  W:    http://oss.sgi.com/projects/xfs
@@@ -4925,11 -4924,11 +4925,11 @@@ L:   zd1211-devs@lists.sourceforge.net (s
  S:    Maintained
  
  ZR36067 VIDEO FOR LINUX DRIVER
- P:    Ronald Bultje
- M:    rbultje@ronald.bitfreak.net
  L:    mjpeg-users@lists.sourceforge.net
+ L:    linux-media@vger.kernel.org
  W:    http://mjpeg.sourceforge.net/driver-zoran/
- S:    Maintained
+ T:    Mercurial http://linuxtv.org/hg/v4l-dvb
+ S:    Odd Fixes
  
  ZS DECSTATION Z85C30 SERIAL DRIVER
  P:    Maciej W. Rozycki