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

1 files changed, 17 insertions, 0 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 30f3c8c9c12a..f2024df7ebe5 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -226,6 +226,23 @@ Who:	Jean Delvare <khali@linux-fr.org>
 
 ---------------------------
 
+What:   i2c_adapter.dev
+        i2c_adapter.list
+When:   July 2007
+Why:    Superfluous, given i2c_adapter.class_dev:
+          * The "dev" was a stand-in for the physical device node that legacy
+            drivers would not have; but now it's almost always present.  Any
+            remaining legacy drivers must upgrade (they now trigger warnings).
+          * The "list" duplicates class device children.
+        The delay in removing this is so upgraded lm_sensors and libsensors
+        can get deployed.  (Removal causes minor changes in the sysfs layout,
+        notably the location of the adapter type name and parenting the i2c
+        client hardware directly from their controller.)
+Who:    Jean Delvare <khali@linux-fr.org>,
+        David Brownell <dbrownell@users.sourceforge.net>
+
+---------------------------
+
 What:   IPv4 only connection tracking/NAT/helpers
 When:   2.6.22
 Why:    The new layer 3 independant connection tracking replaces the old