Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6

diff --combined MAINTAINERS
index a05aefd,5b7a154..b22db52
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -540,8 -540,7 +540,8 @@@ S: Supporte
  
  BTTV VIDEO4LINUX DRIVER
  P:    Mauro Carvalho Chehab
 -M:    mchehab@brturbo.com.br
 +M:    mchehab@infradead.org
 +M:    v4l-dvb-maintainer@linuxtv.org
  L:    video4linux-list@redhat.com
  W:    http://linuxtv.org
  T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
@@@ -838,12 -837,11 +838,12 @@@ S:      Maintaine
  
  DVB SUBSYSTEM AND DRIVERS
  P:    LinuxTV.org Project
 -M:    linux-dvb-maintainer@linuxtv.org
 +M:    mchehab@infradead.org
 +M:    v4l-dvb-maintainer@linuxtv.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
 -S:    Supported
 +S:    Maintained
  
  EATA-DMA SCSI DRIVER
  P:    Michael Neuffer
@@@ -931,6 -929,12 +931,12 @@@ M:       sct@redhat.com, akpm@osdl.org, adilg
  L:    ext3-users@redhat.com
  S:    Maintained
  
+ F71805F HARDWARE MONITORING DRIVER
+ P:    Jean Delvare
+ M:    khali@linux-fr.org
+ L:    lm-sensors@lm-sensors.org
+ S:    Maintained
+ 
  FARSYNC SYNCHRONOUS DRIVER
  P:    Kevin Curtis
  M:    kevin.curtis@farsite.co.uk
@@@ -2958,8 -2962,7 +2964,8 @@@ S:      Maintaine
  
  VIDEO FOR LINUX
  P:    Mauro Carvalho Chehab
 -M:    mchehab@brturbo.com.br
 +M:    mchehab@infradead.org
 +M:    v4l-dvb-maintainer@linuxtv.org
  L:    video4linux-list@redhat.com
  W:    http://linuxtv.org
  T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git