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: (44 commits)
  i2c-s3c2410: Fix bug in releasing driver
  i2c-s3c2410: Fix I2C SDA to SCL setup time
  i2c: New i2c-tiny-usb bus driver
  i2c: Documentation update
  i2c: SPIN_LOCK_UNLOCKED cleanup
  i2c: Obsolete i2c-ixp2000, i2c-ixp4xx and scx200_i2c
  i2c: New Simtec I2C bus driver
  i2c: Bitbanging I2C bus driver using the GPIO API
  Use menuconfig objects - I2C
  i2c: Restore i2c_smbus_read_block_data
  i2c-pxa: Clean transaction stop
  i2c-algo-bit: Improve debugging
  i2c-algo-bit: Implement a 50/50 SCL duty cycle
  i2c-omap: Switch to static adapter numbering
  i2c: Blackfin Two Wire Interface driver
  i2c-algo-sgi: Comment and whitespace cleanups
  i2c: Make i2c_del_driver a void function
  i2c: Move i2c-isa-only exported symbol declarations
  i2c: Document i2c_new_device()
  i2c: Add i2c_new_probed_device()
  ...

Fixed trivial conflict in Documentation/feature-removal-schedule.txt manually.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 10 insertions, 11 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 1a9e600a73a8..7d252dbe7d17 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -190,18 +190,10 @@ Who:	Jean Delvare <khali@linux-fr.org>
 
 ---------------------------
 
-What:   i2c_adapter.dev
-        i2c_adapter.list
+What:   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.)
+Why:    Superfluous, this list duplicates the one maintained by the driver
+        core.
 Who:    Jean Delvare <khali@linux-fr.org>,
         David Brownell <dbrownell@users.sourceforge.net>
 
@@ -331,3 +323,10 @@ Who:	Cornelia Huck <cornelia.huck@de.ibm.com>
 
 ---------------------------
 
+What:   i2c-ixp2000, i2c-ixp4xx and scx200_i2c drivers
+When:   September 2007
+Why:    Obsolete. The new i2c-gpio driver replaces all hardware-specific
+        I2C-over-GPIO drivers.
+Who:    Jean Delvare <khali@linux-fr.org>
+
+---------------------------