> Seems there is conflict after Abel's patchset in next tree, I'll rebase.

True also for the I2C patch. A rebase would be great!