Merge master.kernel.org:/home/rmk/linux-2.6-i2c manually

Old tree, so the automatic merge had some problems.