Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c/m41t00: Do not forget to write year
  i2c-mv64xxx: Fix random oops at boot
  i2c: Migration aids for i2c_adapter.dev removal
  i2c-pnx: Add entry to MAINTAINERS
  i2c-pnx: Fix interrupt handler, get rid of EARLY config option

diff --combined MAINTAINERS
index 0f6d13b,0d54cc4..2bd34ef
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -532,13 -532,13 +532,13 @@@ L:      netdev@vger.kernel.or
  S:    Maintained
  
  ASUS ACPI EXTRAS DRIVER
 +P:    Corentin Chary
 +M:    corentincj@iksaif.net
  P:    Karol Kozimor
  M:    sziwan@users.sourceforge.net
 -P:    Julien Lerouge
 -M:    julien.lerouge@free.fr
  L:    acpi4asus-user@lists.sourceforge.net
  W:    http://sourceforge.net/projects/acpi4asus
 -W:    http://julien.lerouge.free.fr
 +W:    http://xf.iksaif.net/acpi4asus
  S:    Maintained
  
  ATA OVER ETHERNET DRIVER
@@@ -2579,6 -2579,12 +2579,12 @@@ P:    Adam Bela
  M:    ambx1@neo.rr.com
  S:    Maintained
  
+ PNXxxxx I2C DRIVER
+ P:    Vitaly Wool
+ M:    vitalywool@gmail.com
+ L:    i2c@lm-sensors.org
+ S:    Maintained
+ 
  PPP PROTOCOL DRIVERS AND COMPRESSORS
  P:    Paul Mackerras
  M:    paulus@samba.org