From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 5 May 2007 00:46:27 +0000 (-0700)
Subject: Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
X-Git-Tag: v2.6.22-rc1~1081
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d41f0e8d51742aba5bbcab9acb5238a8578c917;p=linux-2.6

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>
---

8d41f0e8d51742aba5bbcab9acb5238a8578c917
diff --cc Documentation/feature-removal-schedule.txt
index 1a9e600a73,547663bdae..7d252dbe7d
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -315,19 -307,10 +307,26 @@@ Who:	David S. Miller <davem@davemloft.n
  
  ---------------------------
  
 +What:	read_dev_chars(), read_conf_data{,_lpm}() (s390 common I/O layer)
 +When:	December 2007
 +Why:	These functions are a leftover from 2.4 times. They have several
 +	problems:
 +	- Duplication of checks that are done in the device driver's
 +	  interrupt handler
 +	- common I/O layer can't do device specific error recovery
 +	- device driver can't be notified for conditions happening during
 +	  execution of the function
 +	Device drivers should issue the read device characteristics and read
 +	configuration data ccws and do the appropriate error handling
 +	themselves.
 +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>
+ 
+ ---------------------------