Merge branch 'i2c-next-s3c' into i2c-next